diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5832b60b7..7c2e8e243 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -198,8 +198,8 @@ jobs: cp app/olive-editor.exe olive-editor cp app/olive-crashhandler.exe olive-editor cp app/olive-editor.pdb olive-editor - windeployqt olive-editor/olive-crashhandler.exe - windeployqt olive-editor/olive-editor.exe + $DEP_LOCATION/bin/windeployqt olive-editor/olive-crashhandler.exe + $DEP_LOCATION/bin/windeployqt olive-editor/olive-editor.exe cp $(cygpath $DEP_LOCATION)/bin/*.dll olive-editor cp $(cygpath $DEP_LOCATION)/crashpad/out/Default/crashpad_handler.exe olive-editor cp $(cygpath $DEP_LOCATION)/bin/minidump_stackwalk.exe olive-editor diff --git a/app/packaging/windows/nsis/olive.nsi b/app/packaging/windows/nsis/olive.nsi index 0aa27c8b6..eb9ea604b 100644 --- a/app/packaging/windows/nsis/olive.nsi +++ b/app/packaging/windows/nsis/olive.nsi @@ -81,5 +81,5 @@ Section "uninstall" SectionEnd Function LaunchOlive - ExecShell "" "$INSTDIR\${APP_TARGET}.exe" + ShellExecAsUser::ShellExecAsUser "" "$INSTDIR\${APP_TARGET}.exe" FunctionEnd diff --git a/app/widget/timelinewidget/view/timelineview.cpp b/app/widget/timelinewidget/view/timelineview.cpp index 04ef5006b..aa8b7492e 100644 --- a/app/widget/timelinewidget/view/timelineview.cpp +++ b/app/widget/timelinewidget/view/timelineview.cpp @@ -401,7 +401,7 @@ void TimelineView::DrawBlocks(QPainter *painter, bool foreground) Block* block = track->NearestBlockBeforeOrAt(start_time); while (block) { - if (block->type() == Block::kClip) { + if (block->type() == Block::kClip || block->type() == Block::kTransition) { qreal block_left = qMax(left_bound, TimeToScene(block->in())); qreal block_right = qMin(right_bound, TimeToScene(block->out())) - 1;