Merge branch '11.1' into 'master'11.1

add upstream 11.1

See merge request opensource-tracking/FreeFileSync!25

1 files changed, 5 insertions, 9 deletions

diff --git a/wx+/app_main.h b/wx+/app_main.h
index 570a2a9c..17a59d7b 100644
--- a/wx+/app_main.h
+++ b/wx+/app_main.h
@@ -21,16 +21,10 @@ bool globalWindowWasSet();
 
 
 
-
 //######################## implementation ########################
 namespace impl
 {
-inline
-bool& refGlobalWindowStatus()
-{
-    static bool status = false; //external linkage!
-    return status;
-}
+inline bool haveGlobalWindow = false;
 }
 
 
@@ -40,10 +34,12 @@ void setGlobalWindow(wxWindow* window)
     wxTheApp->SetTopWindow(window);
     wxTheApp->SetExitOnFrameDelete(true);
 
-    impl::refGlobalWindowStatus() = true;
+    impl::haveGlobalWindow = true;
 }
 
-inline bool globalWindowWasSet() { return impl::refGlobalWindowStatus(); }
+
+inline
+bool globalWindowWasSet() { return impl::haveGlobalWindow; }
 }
 
 #endif //APP_MAIN_H_08215601837818347575856