Max/SameBoy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prevent memory viewer errors on reset

Browse Source
This commit is contained in:
Lior Halphon 2018-06-16 14:46:16 +03:00
parent bc876ec30c
commit ca9249d4db
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Cocoa/Document.m
View File

@ -278,7 +278,7 @@ static void printImage(GB_gameboy_t *gb, uint32_t *image, uint8_t height,
if (hex_controller) { if (hex_controller) {
/* Verify bank sanity, especially when switching models. */ /* Verify bank sanity, especially when switching models. */
[(GBMemoryByteArray *)(hex_controller.byteArray) setSelectedBank:0]; [(GBMemoryByteArray *)(hex_controller.byteArray) setSelectedBank:0];
[self hexUpdateBank:self.memoryBankInput]; [self hexUpdateBank:self.memoryBankInput ignoreErrors:true];
} }
} }
@ -911,7 +911,7 @@ static void printImage(GB_gameboy_t *gb, uint32_t *image, uint8_t height,
} }
} }
- (IBAction)hexUpdateBank:(NSControl *)sender - (void)hexUpdateBank:(NSControl *)sender ignoreErrors: (bool)ignore_errors
{ {
NSString *error = [self captureOutputForBlock:^{ NSString *error = [self captureOutputForBlock:^{
uint16_t addr, bank; uint16_t addr, bank;
@ -954,12 +954,17 @@ static void printImage(GB_gameboy_t *gb, uint32_t *image, uint8_t height,
[hex_controller reloadData]; [hex_controller reloadData];
}]; }];
if (error) { if (error && !ignore_errors) {
NSBeep(); NSBeep();
[GBWarningPopover popoverWithContents:error onView:sender]; [GBWarningPopover popoverWithContents:error onView:sender];
} }
} }
- (IBAction)hexUpdateBank:(NSControl *)sender
{
[self hexUpdateBank:sender ignoreErrors:false];
}
- (IBAction)hexUpdateSpace:(NSPopUpButtonCell *)sender - (IBAction)hexUpdateSpace:(NSPopUpButtonCell *)sender
{ {
self.memoryBankItem.enabled = [sender indexOfSelectedItem] != GBMemoryEntireSpace; self.memoryBankItem.enabled = [sender indexOfSelectedItem] != GBMemoryEntireSpace;