Fix Update Panel on Settings changes

dimfishr · Nov 7, 2016 · 80acbab · 80acbab
1 parent 641bd5f
commit 80acbab
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/fardroid.rc b/fardroid.rc
@@ -53,7 +53,7 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2, 11, 3, 0
+ FILEVERSION 2, 11, 4, 0
  PRODUCTVERSION 2, 0, 0, 0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
@@ -70,7 +70,7 @@ BEGIN
         BLOCK "041904b0"
         BEGIN
             VALUE "FileDescription", "FARDroid FAR Plugin"
-            VALUE "FileVersion", "2, 11, 3, 0\0"
+            VALUE "FileVersion", "2, 11, 4, 0\0"
             VALUE "InternalName", "fardroid"
             VALUE "LegalCopyright", "dimfish 2016, Vladimir Kubyshev 2010"
             VALUE "OriginalFilename", "fardroid.dll"

diff --git a/fardroidPlugin.cpp b/fardroidPlugin.cpp
@@ -214,12 +214,16 @@ intptr_t WINAPI ConfigureW(const struct ConfigureInfo* Info)
     conf.Save();
 
     PanelInfo PInfo;
+    fardroid* android = nullptr;
     fInfo.PanelControl(PANEL_ACTIVE, FCTL_GETPANELINFO, 0, static_cast<void *>(&PInfo));
-    auto android = static_cast<fardroid *>(PInfo.PluginHandle);
+    if (PInfo.PluginHandle && PInfo.PluginHandle != INVALID_HANDLE_VALUE && PInfo.OwnerGuid == MainGuid)
+      android = static_cast<fardroid *>(PInfo.PluginHandle);
+
     if (!android)
     {
       fInfo.PanelControl(PANEL_PASSIVE, FCTL_GETPANELINFO, 0, static_cast<void *>(&PInfo));
-      android = static_cast<fardroid *>(PInfo.PluginHandle);
+      if (PInfo.PluginHandle && PInfo.PluginHandle != INVALID_HANDLE_VALUE && PInfo.OwnerGuid == MainGuid)
+        android = static_cast<fardroid *>(PInfo.PluginHandle);
     }
 
     if (android)

diff --git a/texts/History.txt b/texts/History.txt
@@ -1,4 +1,7 @@
- 31.10.16 v2.11.3
+ 07.11.16 v2.11.4
+  * Fix Update Panel on Settings changes.
+
+ 31.10.16 v2.11.3
   + Autodetect Android 7.0 Emulator root.
   * Fix >2GB size.
   * Fallback to 'su -c' for compatibility.

diff --git a/version.info b/version.info
@@ -1,4 +1,4 @@
 #define MAJORVERSION 2
 #define MINORVERSION 11
-#define REVISION 3
+#define REVISION 4
 #define BUILDNUMBER 0