Merge branch 'mc'

a057b3d7 · nanahira · fc8a6e60 · a4096a16 · a057b3d7 · a057b3d7
Commit a057b3d7 authored Feb 18, 2019 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

ygopro-server.coffee ygopro-server.coffee +2 -1

ygopro-server.js ygopro-server.js +3 -1

No files found.
--- a/ygopro-server.coffee
+++ b/ygopro-server.coffee
@@ -3982,5 +3982,6 @@ if settings.modules.http
      cert: fs.readFileSync(settings.modules.http.ssl.cert)
      key: fs.readFileSync(settings.modules.http.ssl.key)
    https_server = https.createServer(options, requestListener)
-    roomlist.init https_server, ROOM_all
+    if settings.modules.http.websocket_roomlist and roomlist
+      roomlist.init https_server, ROOM_all
    https_server.listen settings.modules.http.ssl.port
--- a/ygopro-server.js
+++ b/ygopro-server.js
@@ -5148,7 +5148,9 @@
        key: fs.readFileSync(settings.modules.http.ssl.key)
      };
      https_server = https.createServer(options, requestListener);
-      roomlist.init(https_server, ROOM_all);
+      if (settings.modules.http.websocket_roomlist && roomlist) {
+        roomlist.init(https_server, ROOM_all);
+      }
      https_server.listen(settings.modules.http.ssl.port);
    }
  }