From 680b3c16a3fd16cfcda71ac665819e648c28fcb4 Mon Sep 17 00:00:00 2001 From: rogerman Date: Sat, 16 Apr 2022 20:40:33 -0700 Subject: [PATCH] Cocoa Port: Troubleshooting forms for Public Release builds now display the same detailed app build info as the other builds. - Since the executable can now contain 5 binary slices, having the detailed info available can provide extra insight on the user's runtime environment. --- .../cocoa/userinterface/troubleshootingWindowDelegate.mm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/desmume/src/frontend/cocoa/userinterface/troubleshootingWindowDelegate.mm b/desmume/src/frontend/cocoa/userinterface/troubleshootingWindowDelegate.mm index c68fa675e..db6dc34ec 100644 --- a/desmume/src/frontend/cocoa/userinterface/troubleshootingWindowDelegate.mm +++ b/desmume/src/frontend/cocoa/userinterface/troubleshootingWindowDelegate.mm @@ -77,12 +77,6 @@ [window makeFirstResponder:nil]; // Set final form text. -#ifdef PUBLIC_RELEASE - NSString *appVersionStr = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"]; -#else - NSString *appVersionStr = [[CocoaDSUtil appInternalVersionString] stringByAppendingString:[CocoaDSUtil appCompilerDetailString]]; -#endif - NSString *romNameStr = (NSString *)[bindings valueForKey:@"romName"]; if (romNameStr == nil) { @@ -96,7 +90,7 @@ } NSString *finalFormTextStr = @"[ BEGIN DESMUME TROUBLESHOOTING INFORMATION ]\n"; - finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nApp Version: "] stringByAppendingString:appVersionStr]; + finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nApp Version: "] stringByAppendingString:[[CocoaDSUtil appInternalVersionString] stringByAppendingString:[CocoaDSUtil appCompilerDetailString]]]; finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nOperating System: "] stringByAppendingString:[CocoaDSUtil operatingSystemString]]; finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nModel Identifier: "] stringByAppendingString:[CocoaDSUtil modelIdentifierString]]; finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nROM Name: "] stringByAppendingString:romNameStr];