Merge pull request #39 from Aperture-Development/bugfix

Bugfix #36

Author: ApertureDevelopment

lua/msync/client_gui/modules/cl_mrsync.lua

@@ -6,7 +6,7 @@ MSync.modules.MRSync = MSync.modules.MRSync or {}
  * @package    MySQL Rank Sync
  * @author     Aperture Development
  * @license    root_dir/LICENCE
- * @version    2.0.0
+ * @version    2.0.2
 ]]
 
 --[[
@@ -16,7 +16,7 @@ MSync.modules.MRSync.info = {
     Name = "MySQL Rank Sync",
     ModuleIdentifier = "MRSync",
     Description = "Synchronise your ranks across your servers",
-    Version = "2.0.0"
+    Version = "2.0.2"
 }
 
 --[[
@@ -71,17 +71,15 @@ function MSync.modules.MRSync.adminPanel(sheet)
     allserver_button:SetPos( 275, 15 )
     allserver_button:SetSize( 130, 20 )
     allserver_button.DoClick = function()
-        if allserver_textentry:GetValue() and not MSync.modules.MRSync.settings.nosync[allserver_textentry:GetValue()] and not MSync.modules.MRSync.settings.syncall[allserver_textentry:GetValue()] then
+        if string.len(allserver_textentry:GetValue()) > 0 and not MSync.modules.MRSync.settings.nosync[allserver_textentry:GetValue()] and not MSync.modules.MRSync.settings.syncall[allserver_textentry:GetValue()] then
+            if string.match(allserver_textentry:GetValue(), "^%s*$") or string.match(allserver_textentry:GetValue(), "%s+$") then return end
             allserver_table:AddLine(allserver_textentry:GetValue())
             MSync.modules.MRSync.settings.syncall[allserver_textentry:GetValue()] = true
             allserver_textentry:SetText("")
             MSync.modules.MRSync.sendSettings()
         end
     end
 
-
-
-
     local nosync_text = vgui.Create( "DLabel", pnl )
     nosync_text:SetPos( 25, 140 )
     nosync_text:SetColor( Color( 0, 0, 0 ) )
@@ -120,18 +118,19 @@ function MSync.modules.MRSync.adminPanel(sheet)
     nosync_button:SetPos( 275, 155 )
     nosync_button:SetSize( 130, 20 )
     nosync_button.DoClick = function()
-        if nosync_textentry:GetValue() and not MSync.modules.MRSync.settings.nosync[allserver_textentry:GetValue()] and not MSync.modules.MRSync.settings.syncall[allserver_textentry:GetValue()] then
+        if string.len(nosync_textentry:GetValue()) > 0 and not MSync.modules.MRSync.settings.nosync[nosync_textentry:GetValue()] and not MSync.modules.MRSync.settings.syncall[nosync_textentry:GetValue()] then
+            if string.match(nosync_textentry:GetValue(), "^%s*$") or string.match(nosync_textentry:GetValue(), "%s+$") then return end
             nosync_table:AddLine(nosync_textentry:GetValue())
-            MSync.modules.MRSync.settings.nosync[allserver_textentry:GetValue()] = true
+            MSync.modules.MRSync.settings.nosync[nosync_textentry:GetValue()] = true
             nosync_textentry:SetText("")
             MSync.modules.MRSync.sendSettings()
         end
     end
 
-    if MSync.DBStatus then
-        MSync.modules.MRSync.getSettings()
-    end
+    -- Load settings from the server
+    MSync.modules.MRSync.getSettings()
 
+    -- Wait for settings from the server
     if not MSync.modules.MRSync.settings then
         timer.Create("mrsync.t.checkSettings", 1, 0, function()
             if not MSync.modules.MRSync.settings then return end

lua/msync/server/modules/sv_mrsync.lua

@@ -6,7 +6,7 @@ MSync.modules.MRSync = MSync.modules.MRSync or {}
  * @package    MySQL Rank Sync
  * @author     Aperture Development
  * @license    root_dir/LICENCE
- * @version    2.0.1
+ * @version    2.0.2
 ]]
 
 --[[
@@ -16,7 +16,7 @@ MSync.modules.MRSync.info = {
     Name = "MySQL Rank Sync",
     ModuleIdentifier = "MRSync",
     Description = "Synchronise your ranks across your servers",
-    Version = "2.0.1"
+    Version = "2.0.2"
 }
 
 --[[