whoopsy, my bad (segfault due to accepting empty lines)
authorsheepluva
Sat, 29 Oct 2011 20:47:40 +0200
changeset 6237 a66029015c18
parent 6235 bb1a657f751b
child 6238 b344159da248
whoopsy, my bad (segfault due to accepting empty lines)
QTfrontend/main.cpp
QTfrontend/ui/widget/chatwidget.cpp
project_files/hedgewars.pro
--- a/QTfrontend/main.cpp	Sat Oct 29 18:20:56 2011 +0200
+++ b/QTfrontend/main.cpp	Sat Oct 29 20:47:40 2011 +0200
@@ -30,6 +30,7 @@
 #include "hwform.h"
 #include "hwconsts.h"
 
+//#include "HWConfigManager.h"
 #include "HWDataManager.h"
 
 #ifdef _WIN32
@@ -153,6 +154,7 @@
         checkForDir(cfgdir->absolutePath() + "/Screenshots");
         checkForDir(cfgdir->absolutePath() + "/Teams");
         checkForDir(cfgdir->absolutePath() + "/Logs");
+        checkForDir(cfgdir->absolutePath() + "/Profiles");
     }
 
     datadir->cd(bindir->absolutePath());
@@ -165,6 +167,9 @@
         return 1;
     }
 
+
+    /*HWConfigManager & cfgMgr = HWConfigManager::instance();
+    cfgMgr.setPath(cfgdir->absolutePath());*/
     HWDataManager & dataMgr = HWDataManager::instance();
 
     {
--- a/QTfrontend/ui/widget/chatwidget.cpp	Sat Oct 29 18:20:56 2011 +0200
+++ b/QTfrontend/ui/widget/chatwidget.cpp	Sat Oct 29 20:47:40 2011 +0200
@@ -483,12 +483,17 @@
     saveList(friendsList, nick.toLower() + "_friends.txt");
 }
 
+
 void HWChatWidget::returnPressed()
 {
     QStringList lines = chatEditLine->text().split('\n');
     chatEditLine->rememberCurrentText();
     foreach (const QString &line, lines)
     {
+        // skip empty/whitespace lines
+        if (line.trimmed().isEmpty())
+            continue;
+
         if (!parseCommand(line))
             emit chatLine(line);
     }
--- a/project_files/hedgewars.pro	Sat Oct 29 18:20:56 2011 +0200
+++ b/project_files/hedgewars.pro	Sat Oct 29 20:47:40 2011 +0200
@@ -70,9 +70,9 @@
     ../QTfrontend/ui/widget/weaponItem.h \
     ../QTfrontend/ui/widget/gamecfgwidget.h \
     ../QTfrontend/ui/widget/mapContainer.h \
-	../QTfrontend/ui/widget/HistoryLineEdit.h \
+    ../QTfrontend/ui/widget/HistoryLineEdit.h \
     ../QTfrontend/ui/widget/SmartLineEdit.h \
-	../QTfrontend/util/HWDataManager.h \
+    ../QTfrontend/util/HWDataManager.h \
     ../QTfrontend/net/netregister.h \
     ../QTfrontend/net/netserver.h \
     ../QTfrontend/net/netudpwidget.h \
@@ -147,7 +147,7 @@
     ../QTfrontend/ui/widget/mapContainer.cpp \
     ../QTfrontend/ui/widget/HistoryLineEdit.cpp \
     ../QTfrontend/ui/widget/SmartLineEdit.cpp \
-	../QTfrontend/util/HWDataManager.cpp \
+    ../QTfrontend/util/HWDataManager.cpp \
     ../QTfrontend/net/tcpBase.cpp \
     ../QTfrontend/net/netregister.cpp \
     ../QTfrontend/net/proto.cpp \
@@ -166,7 +166,7 @@
     ../QTfrontend/HWApplication.cpp \
     ../QTfrontend/hwform.cpp \
     ../QTfrontend/main.cpp \
-	../QTfrontend/util/SDLInteraction.cpp \
+    ../QTfrontend/util/SDLInteraction.cpp \
     ../QTfrontend/team.cpp \
     ../QTfrontend/ui_hwform.cpp \
     ../QTfrontend/hwconsts.cpp