Fixed crash on m1 during window resize

Author: desertkun

fusepb/FuseX.xcodeproj/project.pbxproj

@@ -2040,6 +2040,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
+				CURRENT_PROJECT_VERSION = 3;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 48UV5KV3FB;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -2068,6 +2069,7 @@
 				INFOPLIST_FILE = "Info-FuseX.plist";
 				INSTALL_PATH = /Applications;
 				LIBRARY_SEARCH_PATHS = .;
+				MARKETING_VERSION = 1.5.6;
 				OTHER_CFLAGS = "";
 				OTHER_CODE_SIGN_FLAGS = "--deep";
 				OTHER_LDFLAGS = (
@@ -2093,6 +2095,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
+				CURRENT_PROJECT_VERSION = 3;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 48UV5KV3FB;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -2120,6 +2123,7 @@
 				INFOPLIST_FILE = "Info-FuseX.plist";
 				INSTALL_PATH = /Applications;
 				LIBRARY_SEARCH_PATHS = .;
+				MARKETING_VERSION = 1.5.6;
 				OTHER_CFLAGS = "";
 				OTHER_CODE_SIGN_FLAGS = "--deep";
 				OTHER_LDFLAGS = (
@@ -2144,6 +2148,7 @@
 				CODE_SIGN_ENTITLEMENTS = FuseX.entitlements;
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 3;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 48UV5KV3FB;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -2171,6 +2176,7 @@
 				INFOPLIST_FILE = "Info-FuseX.plist";
 				INSTALL_PATH = /Applications;
 				LIBRARY_SEARCH_PATHS = .;
+				MARKETING_VERSION = 1.5.6;
 				OTHER_CFLAGS = "";
 				OTHER_CODE_SIGN_FLAGS = "--deep";
 				OTHER_LDFLAGS = (

fusepb/Info-FuseX.plist

@@ -599,11 +599,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.6</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>FUSE</string>
 	<key>CFBundleVersion</key>
-	<string>1.5.6</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.games</string>
 	<key>NSMainNibFile</key>

fusepb/views/DisplayOpenGLView.h

@@ -241,4 +241,6 @@
 -(void) displayLinkStop;
 -(void) displayLinkStart;
 
+-(void) doReshape;
+
 @end

fusepb/views/DisplayOpenGLView.m

@@ -550,16 +550,12 @@ -(void) drawRect:(NSRect)aRect
   [view_lock unlock];
 }
 
-/* scrolled, moved or resized */
--(void) reshape
+-(void) doReshape
 {
   [view_lock lock];
   NSRect rect;
 
-  [super reshape];
-
   [[self openGLContext] makeCurrentContext];
-  [[self openGLContext] update];
 
   rect = [self bounds];
 
@@ -570,11 +566,20 @@ -(void) reshape
 
   glMatrixMode( GL_MODELVIEW );
   glLoadIdentity();
+  
+  [[self openGLContext] update];
 
   statusbar_updated = YES;
   [view_lock unlock];
 }
 
+/* scrolled, moved or resized */
+-(void) reshape
+{
+  [super reshape];
+  [self performSelectorOnMainThread:@selector(doReshape) withObject:self waitUntilDone:NO];
+}
+
 -(void) destroyTexture
 {
   GLuint i;