Fix dynamic port issue with custom url

neutralinojs · Jun 14, 2020 · ffe2e5e · ffe2e5e
1 parent a9e7bfd
commit ffe2e5e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/core-linux/src/main.cpp b/core-linux/src/main.cpp
@@ -75,10 +75,6 @@ int main(int argc, char **argv)
 
   int port = stoi(options["appport"].get<string>());
   string appname = options["appname"].get<std::string>();
-  string navigateUrl = ("http://localhost:" + std::to_string(port) + "/" + appname);
-  if(!options["url"].is_null() && options["url"].get<string>() != "/")
-    navigateUrl = options["url"];
-
   string mode = privileges::getMode();
 
   int listenFd = Socket::createSocket();
@@ -101,7 +97,9 @@ int main(int argc, char **argv)
     port = ntohs(sin.sin_port);
     settings::setOption("appport", std::to_string(port));
   }
-
+  string navigateUrl = ("http://localhost:" + std::to_string(port) + "/" + appname);
+  if(!options["url"].is_null() && options["url"].get<string>() != "/")
+    navigateUrl = options["url"];
   Socket::Listen(listenFd);
 
   if (mode == "browser")

diff --git a/core-macos/src/main.cpp b/core-macos/src/main.cpp
@@ -84,10 +84,6 @@ int main(int argc, char **argv)
 
     int port = stoi(options["appport"].get<string>());
     string appname = options["appname"].get<std::string>();
-    string navigateUrl = ("http://localhost:" + std::to_string(port) + "/" + appname);
-    if(!options["url"].is_null() && options["url"].get<string>() != "/")
-        navigateUrl = options["url"];
-
     string mode = privileges::getMode();
 
     int listenFd = Socket::createSocket();
@@ -109,6 +105,10 @@ int main(int argc, char **argv)
         settings::setOption("appport", std::to_string(port));
     }
 
+    string navigateUrl = ("http://localhost:" + std::to_string(port) + "/" + appname);
+    if(!options["url"].is_null() && options["url"].get<string>() != "/")
+    navigateUrl = options["url"];
+
     Socket::Listen(listenFd);
 
     if(mode == "browser") {

diff --git a/core-windows/src/serverlistener.cpp b/core-windows/src/serverlistener.cpp
@@ -63,10 +63,6 @@ void ServerListener::run(std::function<void(ClientAcceptationException)> client_
     json options = settings::getOptions();
     string appname = options["appname"];
     string appport = options["appport"];
-    string navigateUrl = "http://localhost:" + appport + "/" + appname;
-    if(!options["url"].is_null() && options["url"].get<string>() != "/")
-        navigateUrl = options["url"];
-
     string mode = privileges::getMode();
     this->port = stoi(appport);
 
@@ -104,6 +100,10 @@ void ServerListener::run(std::function<void(ClientAcceptationException)> client_
         settings::setOption("appport", std::to_string(port));
         appport = std::to_string(port);
     }
+    string navigateUrl = "http://localhost:" + appport + "/" + appname;
+    if(!options["url"].is_null() && options["url"].get<string>() != "/")
+        navigateUrl = options["url"];
+
 
     if(listen(listen_socket, SOMAXCONN) == SOCKET_ERROR) {
         closesocket(listen_socket);