646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
25 lines
967 B
Diff
25 lines
967 B
Diff
diff --git a/settings/QvkSettings.cpp b/settings/QvkSettings.cpp
|
|
index 3008e62..07485bd 100644
|
|
--- a/settings/QvkSettings.cpp
|
|
+++ b/settings/QvkSettings.cpp
|
|
@@ -66,17 +66,8 @@ void QvkSettings::readAll()
|
|
Minimized = settings.value( "Minimized", 0 ).toUInt();
|
|
MinimizedByStart = settings.value( "MinimizedByStart", 0 ).toUInt();
|
|
Countdown = settings.value( "Countdown", 0 ).toUInt();
|
|
- QFile file;
|
|
- if ( file.exists( qApp->applicationDirPath().append( "/bin/ffmpeg" ) ) == true )
|
|
- {
|
|
- vokoscreenWithLibs = true;
|
|
- Recorder = qApp->applicationDirPath().append( "/bin/ffmpeg" );
|
|
- }
|
|
- else
|
|
- {
|
|
- vokoscreenWithLibs = false;
|
|
- Recorder = settings.value( "Recorder", "ffmpeg" ).toString();
|
|
- }
|
|
+ vokoscreenWithLibs = true;
|
|
+ Recorder = settings.value( "Recorder", "@ffmpeg@/bin/ffmpeg" ).toString();
|
|
settings.endGroup();
|
|
|
|
settings.beginGroup( "Videooptions" );
|