MD-71

git-svn-id: https://svn.code.sf.net/p/osirix/code/osirix@10852 4e9e6e3d-4551-47eb-9dbe-a6127f9400a1
pixmeo · Jan 22, 2013 · e555a46 · e555a46
1 parent d7c016f
commit e555a46
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/ThreadModalForWindowController.mm b/ThreadModalForWindowController.mm
@@ -254,7 +254,11 @@ -(void)observeValueForKeyPath:(NSString*)keyPath ofObject:(NSThread*)obj change:
 -(void)invalidate {
 	DLog(@"[ThreadModalForWindowController invalidate]");
 	[[NSNotificationCenter defaultCenter] removeObserver:self name:NSThreadWillExitNotification object:_thread];
-	[self.thread.threadDictionary removeObjectForKey:NSThreadModalForWindowControllerKey];
+
+    @synchronized( self.thread.threadDictionary)
+    {
+        [self.thread.threadDictionary removeObjectForKey:NSThreadModalForWindowControllerKey];
+    }
 
     _isValid = NO;
 
@@ -297,7 +301,10 @@ -(ThreadModalForWindowController*)startModalForWindow:(NSWindow*)window {
 }
 
 -(ThreadModalForWindowController*)modalForWindowController {
-	return [self.threadDictionary objectForKey:NSThreadModalForWindowControllerKey];
+    @synchronized( self.threadDictionary)
+    {
+        return [self.threadDictionary objectForKey:NSThreadModalForWindowControllerKey];
+    }
 }
 
 @end

diff --git a/ViewerController.m b/ViewerController.m
@@ -8023,7 +8023,10 @@ + (void) loadImageData:(id) dict
 			return;
 		}
 
-		[[NSThread currentThread].threadDictionary setObject: [NSNumber numberWithFloat: 1.0] forKey: @"loadingPercentage"];
+        @synchronized( [NSThread currentThread])
+        {
+            [[NSThread currentThread].threadDictionary setObject: [NSNumber numberWithFloat: 1.0] forKey: @"loadingPercentage"];
+        }
 	}
 	@catch (NSException * e) 
 	{