# HG changeset patch # User sheepluva # Date 1319914060 -7200 # Node ID a66029015c1852a62732bd4a6fa30e94be430841 # Parent bb1a657f751b38ce0c38425e7a65f1858caae00b whoopsy, my bad (segfault due to accepting empty lines) diff -r bb1a657f751b -r a66029015c18 QTfrontend/main.cpp --- 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(); { diff -r bb1a657f751b -r a66029015c18 QTfrontend/ui/widget/chatwidget.cpp --- 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); } diff -r bb1a657f751b -r a66029015c18 project_files/hedgewars.pro --- 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