diff options
| author | Blue <bluesansdouze@gmail.com> | 2009-05-21 15:14:52 +0200 |
|---|---|---|
| committer | Blue <bluesansdouze@gmail.com> | 2009-05-21 15:14:52 +0200 |
| commit | a9df0306b4949f10287657a229e1f8d33cfae5e9 (patch) | |
| tree | b3dff4b9f36e12d1492d534943796017a955bc3e /src/gui/widgets/chattab.cpp | |
| parent | 7b76f0e8c4c489254d7519e2916b951601423801 (diff) | |
| parent | b85793ec89e57ae20140957f833a06b874eb3120 (diff) | |
| download | mana-a9df0306b4949f10287657a229e1f8d33cfae5e9.tar.gz mana-a9df0306b4949f10287657a229e1f8d33cfae5e9.tar.bz2 mana-a9df0306b4949f10287657a229e1f8d33cfae5e9.tar.xz mana-a9df0306b4949f10287657a229e1f8d33cfae5e9.zip | |
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/gui/widgets/chattab.cpp')
| -rw-r--r-- | src/gui/widgets/chattab.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp index 711680d1..85353bf7 100644 --- a/src/gui/widgets/chattab.cpp +++ b/src/gui/widgets/chattab.cpp @@ -227,15 +227,19 @@ void ChatTab::chatInput(std::string &msg) std::string temp = msg.substr(start + 1, end - start - 1); - toLower(trim(temp)); - - const ItemInfo itemInfo = ItemDB::get(temp); - if (itemInfo.getName() != _("Unknown item")) + // Do not parse an empty string (it crashes the client) + if (!temp.empty()) { - msg.insert(end, "@@"); - msg.insert(start+1, "|"); - msg.insert(start+1, toString(itemInfo.getId())); - msg.insert(start+1, "@@"); + toLower(trim(temp)); + + const ItemInfo itemInfo = ItemDB::get(temp); + if (itemInfo.getName() != _("Unknown item")) + { + msg.insert(end, "@@"); + msg.insert(start+1, "|"); + msg.insert(start+1, toString(itemInfo.getId())); + msg.insert(start+1, "@@"); + } } } start = msg.find('[', start + 1); |