Fixed some CYInitialize issues noticed back on the iPhone.

diff --git a/Execute.cpp b/Execute.cpp
index 3135c2c54af224dfdf5e32d29432abf938c86ed5..a517fb4df08c8d1b17c8b47b37e05b0ef8fb55d7 100644 (file)
--- a/Execute.cpp
+++ b/Execute.cpp
@@ -1279,7 +1279,13 @@ extern "C" void CydgetSetupContext(JSGlobalContextRef context) {
     CYSetupContext(context);
 }
 
     CYSetupContext(context);
 }
 

+static bool initialized_ = false;
+

 void CYInitializeDynamic() {
 void CYInitializeDynamic() {

+    if (!initialized_)
+        initialized_ = true;
+    else return;
+

     CYInitializeStatic();
 
     _sqlcall(sqlite3_open("/usr/lib/libcycript.db", &Bridge_));
     CYInitializeStatic();
 
     _sqlcall(sqlite3_open("/usr/lib/libcycript.db", &Bridge_));

diff --git a/Handler.mm b/Handler.mm
index 79528c447723723f1eaeb383031d35c0c8a50974..38ef638182fe2d37dbd0733a0159d29b4ecf2765 100644 (file)
--- a/Handler.mm
+++ b/Handler.mm
@@ -38,6 +38,7 @@
 /* }}} */
 
 #include "cycript.hpp"
 /* }}} */
 
 #include "cycript.hpp"

+#include "JavaScript.hpp"

 
 #include "Pooling.hpp"
 #include "Parser.hpp"
 
 #include "Pooling.hpp"
 #include "Parser.hpp"


@@ -173,7 +174,7 @@ extern "C" void CYHandleClient(apr_pool_t *pool, int socket) {
 }
 
 extern "C" void CYHandleServer(pid_t pid) {
 }
 
 extern "C" void CYHandleServer(pid_t pid) {

-    CYInitialize();
+    CYInitializeDynamic();

 
     int socket(_syscall(::socket(PF_UNIX, SOCK_STREAM, 0))); try {
         struct sockaddr_un address;
 
     int socket(_syscall(::socket(PF_UNIX, SOCK_STREAM, 0))); try {
         struct sockaddr_un address;