From 4eaed7ef34d52c2daffa1db629a4b90649e009d2 Mon Sep 17 00:00:00 2001
From: John Sully <john@csquare.ca>
Date: Tue, 17 Dec 2019 23:40:59 -0500
Subject: [PATCH] Ignore enable-pro with no license key.  makes it easier to
 launch a demo from the open source version

Former-commit-id: 31ab6bcd6f39f0a4a9e50a5af613b293eecfb4c2
---
 src/config.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/config.cpp b/src/config.cpp
index 40eefb5b8..a0686d899 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -841,12 +841,15 @@ void loadServerConfigFromString(char *config) {
         } else if (!strcasecmp(argv[0],"storage-provider") && argc >= 2) {
             if (!initializeStorageProvider(argv+1, argc-1, &err))
                 goto loaderr;
-        } else if (!strcasecmp(argv[0],"enable-pro") && argc == 2) {
-            if (!FValidKey(argv[1], strlen(argv[1]))) {
-                err = "Invalid license key";
-                goto loaderr;
+        } else if (!strcasecmp(argv[0],"enable-pro") && (argc == 1 || argc == 2)) {
+            if (argc == 2)
+            {
+                if (!FValidKey(argv[1], strlen(argv[1]))) {
+                    err = "Invalid license key";
+                    goto loaderr;
+                }
+                cserver.license_key = zstrdup(argv[1]);
             }
-            cserver.license_key = zstrdup(argv[1]);
         } else {
             err = "Bad directive or wrong number of arguments"; goto loaderr;
         }