nixpkgs/pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

25 lines
967 B
Diff
Raw Normal View History

diff --git a/settings/QvkSettings.cpp b/settings/QvkSettings.cpp
2019-04-22 20:20:53 +00:00
index 3008e62..07485bd 100644
--- a/settings/QvkSettings.cpp
+++ b/settings/QvkSettings.cpp
2019-04-22 20:20:53 +00:00
@@ -66,17 +66,8 @@ void QvkSettings::readAll()
Minimized = settings.value( "Minimized", 0 ).toUInt();
2019-04-22 20:20:53 +00:00
MinimizedByStart = settings.value( "MinimizedByStart", 0 ).toUInt();
Countdown = settings.value( "Countdown", 0 ).toUInt();
- QFile file;
- if ( file.exists( qApp->applicationDirPath().append( "/bin/ffmpeg" ) ) == true )
- {
2019-04-22 20:20:53 +00:00
- vokoscreenWithLibs = true;
- Recorder = qApp->applicationDirPath().append( "/bin/ffmpeg" );
- }
- else
- {
2019-04-22 20:20:53 +00:00
- vokoscreenWithLibs = false;
- Recorder = settings.value( "Recorder", "ffmpeg" ).toString();
- }
+ vokoscreenWithLibs = true;
+ Recorder = settings.value( "Recorder", "@ffmpeg@/bin/ffmpeg" ).toString();
settings.endGroup();
settings.beginGroup( "Videooptions" );