Commit 20651de0 authored by Rafaël Carré's avatar Rafaël Carré Committed by Felix Paul Kühne

OSX GUI: move single termination variable where it's used

Use boolean for those variables
(cherry picked from commit 220a9ee46edcfa8565ad35d4c128ecfaabba9ff1)
Signed-off-by: default avatarFelix Paul Kühne <fkuehne@videolan.org>
parent a9ae88b7
...@@ -188,7 +188,6 @@ void WindowClose( vout_window_t *p_wnd ) ...@@ -188,7 +188,6 @@ void WindowClose( vout_window_t *p_wnd )
* Run: main loop * Run: main loop
*****************************************************************************/ *****************************************************************************/
static NSLock * o_appLock = nil; // controls access to f_appExit static NSLock * o_appLock = nil; // controls access to f_appExit
static int f_appExit = 0; // set to 1 when application termination signaled
static void Run( intf_thread_t *p_intf ) static void Run( intf_thread_t *p_intf )
{ {
...@@ -683,10 +682,12 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -683,10 +682,12 @@ static VLCMain *_o_sharedMainInstance = nil;
/* don't allow a double termination call. If the user has /* don't allow a double termination call. If the user has
* already invoked the quit then simply return this time. */ * already invoked the quit then simply return this time. */
int isTerminating = false; static bool f_appExit = false;
bool isTerminating;
[o_appLock lock]; [o_appLock lock];
isTerminating = (f_appExit++ > 0 ? 1 : 0); isTerminating = f_appExit;
f_appExit = true;
[o_appLock unlock]; [o_appLock unlock];
if (isTerminating) if (isTerminating)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment