From bd105624174a6be2c79917203fe28348389b07ff Mon Sep 17 00:00:00 2001 From: clobber Date: Sun, 22 Sep 2013 14:15:27 -0700 Subject: [PATCH] Close the right window when using the stop button on the game controls bar. --- OpenEmu/OEGameControlsBar.m | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/OpenEmu/OEGameControlsBar.m b/OpenEmu/OEGameControlsBar.m index 197b0746dc..b44e45df8c 100644 --- a/OpenEmu/OEGameControlsBar.m +++ b/OpenEmu/OEGameControlsBar.m @@ -593,6 +593,11 @@ - (BOOL)isOpaque return NO; } +- (void)stopEmulation:(id)sender +{ + [[[self window] parentWindow] performClose:self]; +} + #pragma mark - - (void)drawRect:(NSRect)dirtyRect @@ -606,7 +611,8 @@ - (void)setupControls OEButton *stopButton = [[OEButton alloc] init]; [stopButton setThemeKey:@"hud_button_power"]; [stopButton setTitle:nil]; - [stopButton setAction:@selector(performClose:)]; + [stopButton setTarget:self]; + [stopButton setAction:@selector(stopEmulation:)]; [stopButton setFrame:NSMakeRect(10, 13, 51, 23)]; [stopButton setAutoresizingMask:NSViewMaxXMargin | NSViewMinYMargin]; [stopButton setToolTip:NSLocalizedString(@"Stop Emulation", @"Tooltip")];