Skip to content

Commit

Permalink
When the simulator dies, don't assume it's a bug and provide a more h…
Browse files Browse the repository at this point in the history
…elpful message.
  • Loading branch information
shysaur committed Feb 11, 2015
1 parent 4d5aed1 commit cf1be99
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
Binary file modified M68kSimApp/M68kSimApp/Base.lproj/Localizable.strings
Binary file not shown.
4 changes: 2 additions & 2 deletions M68kSimApp/M68kSimApp/MOSSimulatorViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ - (void)simulatorIsDead {
pw = [[self view] window];
alert = [[NSAlert alloc] init];
[alert setAlertStyle:NSCriticalAlertStyle];
[alert setMessageText:NSLocalizedString(@"Simulator backend died unexpectedly", @"Title of simulator death alert")];
[alert setInformativeText:NSLocalizedString(@"This is a bug. Want to restart from scratch or you want to cancel the simulation?", @"Informative text of simulator death alert")];
[alert setMessageText:NSLocalizedString(@"Your program has died", @"Title of simulator death alert")];
[alert setInformativeText:NSLocalizedString(@"This usually happens when your program accesses a memory area which you didn't declare with the DC or DS directives, or when a stack overflow occurs.", @"Informative text of simulator death alert")];
[alert addButtonWithTitle:NSLocalizedString(@"Restart", @"Restart (simulator)")];
[alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Cancel")];
[alert beginSheetModalForWindow:pw completionHandler:^(NSModalResponse resp){
Expand Down
2 changes: 1 addition & 1 deletion M68kSimApp/Tricky68k.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
011202901A55CDF300F61E42 /* MOSSimRegistersDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MOSSimRegistersDataSource.m; sourceTree = "<group>"; };
012AEB1A1A703F5A00906B25 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = BUILT_PRODUCTS_DIR; };
012AEB1D1A7045E400906B25 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = ../../Updates/dsa_pub.pem; sourceTree = "<group>"; };
013A6AFA1A718458007C053B /* Base */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/Localizable.strings; sourceTree = "<group>"; };
013A6AFA1A718458007C053B /* Base */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/Localizable.strings; sourceTree = "<group>"; };
014A3C681A5D3B1900F73FC5 /* MOSNamedPipe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MOSNamedPipe.h; sourceTree = "<group>"; };
014A3C691A5D3B1900F73FC5 /* MOSNamedPipe.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MOSNamedPipe.m; sourceTree = "<group>"; };
014A3C6B1A5D432300F73FC5 /* MOSTeletypeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MOSTeletypeView.h; sourceTree = "<group>"; };
Expand Down

0 comments on commit cf1be99

Please sign in to comment.