fix: don't run main method on init (#161)

NativeScript · Apr 21, 2022 · 88cc3b7 · 88cc3b7
1 parent ecbcaff
commit 88cc3b7
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/AppWithModules/Source Files/main.m b/AppWithModules/Source Files/main.m
@@ -24,7 +24,8 @@ int main(int argc, char *argv[]) {
         config.ArgumentsCount = argc;
         config.Arguments = argv;
 
-        nativescript = [NativeScript alloc] initWithConfig: config];
+        nativescript = [[NativeScript alloc] initWithConfig: config];
+        [nativescript runMainApplication];
 
         return 0;
     }

diff --git a/NativeScript/NativeScript.h b/NativeScript/NativeScript.h
@@ -15,6 +15,10 @@
 @interface NativeScript : NSObject
 
 - (instancetype)initWithConfig:(Config*)config;
+/**
+ WARNING: this method does not return in most applications. (UIApplicationMain)
+ */
+- (void)runMainApplication;
 - (bool)liveSync;
 
 @end
diff --git a/NativeScript/NativeScript.mm b/NativeScript/NativeScript.mm
@@ -53,18 +53,20 @@ - (instancetype)initWithConfig:(Config*)config {
             inspectorClient->registerModules();
             inspectorClient->connect([config ArgumentsCount], [config Arguments]);
         }
-
-        runtime_->RunMainScript();
-
-        CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, true);
-
-        tns::Tasks::Drain();
     }
 
     return self;
 
 }
 
+- (void)runMainApplication {
+    runtime_->RunMainScript();
+
+    CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, true);
+
+    tns::Tasks::Drain();
+}
+
 - (bool)liveSync {
     if (runtime_ == nullptr) {
         return false;

diff --git a/TestRunner/Source Files/main.m b/TestRunner/Source Files/main.m
@@ -25,6 +25,7 @@ int main(int argc, char *argv[]) {
         config.Arguments = argv;
 
         nativescript = [[NativeScript alloc] initWithConfig:config];
+        [nativescript runMainApplication];
 
         return 0;
     }

diff --git a/project-template/internal/main.m b/project-template/internal/main.m
@@ -57,6 +57,7 @@ int main(int argc, char *argv[]) {
         config.Arguments = argv;
 
         nativescript = [[NativeScript alloc] initWithConfig:config];
+        [nativescript runMainApplication];
 
         return 0;
     }