diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-11-09 17:59:14 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-11-09 17:59:14 +0300 |
| commit | db1e60556c72b1b87ff2a384c556ccca724c46d6 (patch) | |
| tree | 22a5f4e9c4f436ef8e746e0a2d688de80c1597a6 /src/gui/widgets/tabs/whispertab.cpp | |
| parent | c2bb49be52a92deccec7428b6859242688fc8987 (diff) | |
| parent | 1716861f0ee2f7a3714c5b44bb0f017c3d8d3b2c (diff) | |
| download | plus-db1e60556c72b1b87ff2a384c556ccca724c46d6.tar.gz plus-db1e60556c72b1b87ff2a384c556ccca724c46d6.tar.bz2 plus-db1e60556c72b1b87ff2a384c556ccca724c46d6.tar.xz plus-db1e60556c72b1b87ff2a384c556ccca724c46d6.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/gui/widgets/tabs/whispertab.cpp')
| -rw-r--r-- | src/gui/widgets/tabs/whispertab.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/gui/widgets/tabs/whispertab.cpp b/src/gui/widgets/tabs/whispertab.cpp index 7ad14ac65..58849b623 100644 --- a/src/gui/widgets/tabs/whispertab.cpp +++ b/src/gui/widgets/tabs/whispertab.cpp @@ -51,20 +51,17 @@ WhisperTab::~WhisperTab() void WhisperTab::handleInput(const std::string &msg) { + std::string newMsg; if (chatWindow) - { - Net::getChatHandler()->privateMessage(mNick, - chatWindow->doReplace(msg)); - } + newMsg = chatWindow->doReplace(msg); else - { - Net::getChatHandler()->privateMessage(mNick, msg); - } + newMsg = msg; + Net::getChatHandler()->privateMessage(mNick, newMsg); if (player_node) - chatLog(player_node->getName(), msg); + chatLog(player_node->getName(), newMsg); else - chatLog("?", msg); + chatLog("?", newMsg); } void WhisperTab::handleCommand(const std::string &msg) |