Merge pull request #864 from g-maxime/ffmpeg-plugin-activation

Windows GUI: Fix unwanted deactivation of the ffmpeg plugin
MediaArea · Jun 5, 2024 · 029a950 · 029a950
2 parents bbfebe6 + 5830e02
commit 029a950
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/Source/GUI/VCL/GUI_Preferences.cpp b/Source/GUI/VCL/GUI_Preferences.cpp
@@ -436,21 +436,24 @@ void __fastcall TPreferencesF::Advanced_InformTimestampClick(TObject *Sender)
 //---------------------------------------------------------------------------
 void __fastcall TPreferencesF::Advanced_EnableFfmpegClick(TObject *Sender)
 {
-    if (Advanced_EnableFfmpeg->Checked && Prefs->Config(__T("EnableFfmpeg"), 1) != __T("1"))
+    if (Advanced_EnableFfmpeg->Checked)
     {
         #ifndef MEDIAINFOGUI_PLUGIN_NO
-        Ztring InstallFolder = Application->ExeName.c_str();
-        InstallFolder = InstallFolder.substr(0, InstallFolder.rfind(__T("\\")) + 1);
-
-        if (!File::Exists(InstallFolder+__T("\\Plugin\\FFmpeg\\version.txt"))) //Try to install plugin
+        if (Prefs->Config(__T("EnableFfmpeg"), 1) != __T("1"))
         {
-            TPluginF* P = new TPluginF(this, PLUGIN_FFMPEG);
-            if (P->Configure())
-                P->ShowModal();
-            delete P;
-
-            if (!File::Exists(InstallFolder+__T("\\Plugin\\FFmpeg\\version.txt")))
-                MessageBox(NULL, __T("An error occured, please download and install the plugin manually from the MediaInfo download page."), __T("Error"), MB_OK);
+            Ztring InstallFolder = Application->ExeName.c_str();
+            InstallFolder = InstallFolder.substr(0, InstallFolder.rfind(__T("\\")) + 1);
+
+            if (!File::Exists(InstallFolder+__T("\\Plugin\\FFmpeg\\version.txt"))) //Try to install plugin
+            {
+                TPluginF* P = new TPluginF(this, PLUGIN_FFMPEG);
+                if (P->Configure())
+                    P->ShowModal();
+                delete P;
+
+                if (!File::Exists(InstallFolder+__T("\\Plugin\\FFmpeg\\version.txt")))
+                    MessageBox(NULL, __T("An error occured, please download and install the plugin manually from the MediaInfo download page."), __T("Error"), MB_OK);
+            }
         }
         #endif
         Prefs->Config(__T("EnableFfmpeg"), 1)=__T("1");