From f97a71b47d96105383ea5d58e35848b7468931fd Mon Sep 17 00:00:00 2001
From: Teuniz <teuniz@gmail.com>
Date: Sun, 22 Nov 2015 10:31:29 +0100
Subject: [PATCH]  LAN connection: fixed a bug that prevented to use IP numbers
 like "100".

 GUI: never use native menubar in order to prevent the menubar from not showing up.
---
 global.h              |  2 +-
 mainwindow.cpp        | 31 ++++++++++++++++++++++++-------
 mainwindow_constr.cpp |  2 ++
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/global.h b/global.h
index 05d5f03..e07b3e7 100644
--- a/global.h
+++ b/global.h
@@ -33,7 +33,7 @@
 
 
 #define PROGRAM_NAME          "DSRemote"
-#define PROGRAM_VERSION       "0.31_1511141207"
+#define PROGRAM_VERSION       "0.31_1511221022"
 
 #define MAX_PATHLEN            4096
 
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 31fbe7f..f930e83 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -109,20 +109,37 @@ void UI_Mainwindow::open_connection()
       goto OUT_ERROR;
     }
 
+    int cf = 0;
+
     for(i=0; i<len; i++)
     {
+      if(dev_str[i] == '.')
+      {
+        cf = 0;
+      }
+
       if(dev_str[i] == '0')
       {
-        if((dev_str[i+1] != 0) && (dev_str[i+1] != '.'))
+        if(cf == 0)
         {
-          for(j=i; j<len; j++)
+          if((dev_str[i+1] != 0) && (dev_str[i+1] != '.'))
           {
-            dev_str[j] = dev_str[j+1];
+            for(j=i; j<len; j++)
+            {
+              dev_str[j] = dev_str[j+1];
+            }
+
+            i--;
+
+            len--;
           }
-
-          i--;
-
-          len--;
+        }
+      }
+      else
+      {
+        if(dev_str[i] != '.')
+        {
+          cf = 1;
         }
       }
     }
diff --git a/mainwindow_constr.cpp b/mainwindow_constr.cpp
index 8ff726d..6b62528 100644
--- a/mainwindow_constr.cpp
+++ b/mainwindow_constr.cpp
@@ -54,6 +54,8 @@ UI_Mainwindow::UI_Mainwindow()
 
   setlocale(LC_NUMERIC, "C");
 
+  QCoreApplication::setAttribute(Qt::AA_DontUseNativeMenuBar);
+
   QCoreApplication::setOrganizationName("TvB");
   QCoreApplication::setOrganizationDomain("teuniz.net");
   QCoreApplication::setApplicationName(PROGRAM_NAME);