From df064ddd21486c5d9fbd7466dd94bfc2ea1b8328 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Tue, 9 Apr 2013 16:02:40 -0600 Subject: [PATCH] Use isDevMode method to determine whether to use bundle resource path --- native/atom_window_controller.h | 1 + native/atom_window_controller.mm | 11 +++-------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/native/atom_window_controller.h b/native/atom_window_controller.h index 089907ba9..92151dbb4 100644 --- a/native/atom_window_controller.h +++ b/native/atom_window_controller.h @@ -31,6 +31,7 @@ class AtomCefClient; - (id)initSpecsThenExit:(BOOL)exitWhenDone; - (id)initBenchmarksThenExit:(BOOL)exitWhenDone; - (void)setPidToKillOnClose:(NSNumber *)pid; +- (BOOL)isDevMode; - (void)toggleDevTools; - (void)showDevTools; diff --git a/native/atom_window_controller.mm b/native/atom_window_controller.mm index b3d4bff7f..2e4bd07a0 100644 --- a/native/atom_window_controller.mm +++ b/native/atom_window_controller.mm @@ -103,9 +103,7 @@ - (id)initWithPath:(NSString *)path { _pathToOpen = [path retain]; - AtomApplication *atomApplication = (AtomApplication *)[AtomApplication sharedApplication]; - BOOL useBundleResourcePath = [atomApplication.arguments objectForKey:@"dev"] == nil; - return [self initWithBootstrapScript:@"window-bootstrap" background:NO useBundleResourcePath:useBundleResourcePath]; + return [self initWithBootstrapScript:@"window-bootstrap" background:NO useBundleResourcePath:![self isDevMode]]; } - (id)initDevWithPath:(NSString *)path { @@ -114,10 +112,7 @@ } - (id)initInBackground { - AtomApplication *atomApplication = (AtomApplication *)[AtomApplication sharedApplication]; - BOOL useBundleResourcePath = [atomApplication.arguments objectForKey:@"dev"] == nil; - - [self initWithBootstrapScript:@"window-bootstrap" background:YES useBundleResourcePath:useBundleResourcePath]; + [self initWithBootstrapScript:@"window-bootstrap" background:YES useBundleResourcePath:![self isDevMode]]; [self.window setFrame:NSMakeRect(0, 0, 0, 0) display:NO]; [self.window setExcludedFromWindowsMenu:YES]; [self.window setCollectionBehavior:NSWindowCollectionBehaviorStationary]; @@ -271,7 +266,7 @@ [_devButton setHidden:NO]; } -- (bool)isDevMode { +- (BOOL)isDevMode { NSString *bundleResourcePath = [[NSBundle bundleForClass:self.class] resourcePath]; return ![_resourcePath isEqualToString:bundleResourcePath]; }