1.9.9

Author: rexdf

CommandTrayHost/cache.cpp

@@ -132,10 +132,14 @@ bool is_config_changed()
 
 bool reload_config()
 {
+	static int atom_variable = 0;
+	if (atom_variable)return false;
+	atom_variable = 1;
 	LOGMESSAGE(L"GetCurrentThreadId:%d\n", GetCurrentThreadId());
 	if (global_stat == nullptr)
 	{
 		LOGMESSAGE(L"global_stat is nullptr\n");
+		atom_variable = 0;
 		return false;
 	}
 	assert(conform_cache_expire);
@@ -162,10 +166,10 @@ bool reload_config()
 		}
 		if (IDCANCEL == result)
 		{
+			atom_variable = 0;
 			return true;
 		}
 
-
 		reload_config_with_cache = IDNO == result;
 
 		unregisterhotkey_killtimer_all();
@@ -186,12 +190,14 @@ bool reload_config()
 		extern HICON gHicon;
 		if (NULL == init_global(ghJob, gHicon))
 		{
+			atom_variable = 0;
 			return false;
 		}
 		start_all(ghJob);
 		DeleteTrayIcon();
 		ShowTrayIcon(CONFIG_FILENAMEW L" has been reloaded.", NIM_ADD);
 	}
+	atom_variable = 0;
 	return true;
 }
 
@@ -410,7 +416,7 @@ bool flush_cache(/*bool is_exit*/)
 #endif
 			return true;
 		}
-	}
+}
 
 	return false;
 }

appveyor.yml

@@ -32,7 +32,7 @@ before_build:
     - cmd: >-
         C:\Python36\Scripts\pip.exe install chardet pytz
 
-        C:\Python36\python.exe version_set.py %APPVEYOR_BUILD_NUMBER% 1 9 8
+        C:\Python36\python.exe version_set.py %APPVEYOR_BUILD_NUMBER% 1 9 9
 build:
   project: c:\projects\CommandTrayHost\CommandTrayHost.sln
   verbosity: minimal