summaryrefslogtreecommitdiff
path: root/src/commands.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-21 12:11:20 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-21 12:11:20 +0300
commit5809c2403e414a5ee9d17ca206557bde62ca21a1 (patch)
tree21213cbf3e24f7944c4b64889487ffe241c22247 /src/commands.cpp
parentd83c6dd523827087681f019ebfca8798380dc968 (diff)
downloadmanaplus-5809c2403e414a5ee9d17ca206557bde62ca21a1.tar.gz
manaplus-5809c2403e414a5ee9d17ca206557bde62ca21a1.tar.bz2
manaplus-5809c2403e414a5ee9d17ca206557bde62ca21a1.tar.xz
manaplus-5809c2403e414a5ee9d17ca206557bde62ca21a1.zip
Fix upload commands showing to non general tab.
Diffstat (limited to 'src/commands.cpp')
-rw-r--r--src/commands.cpp13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/commands.cpp b/src/commands.cpp
index 93e07b0f8..d4134c560 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -1323,7 +1323,8 @@ static int uploadUpdate(void *ptr,
static void uploadFile(const std::string &str,
const std::string &fileName,
- const std::string &addStr)
+ const std::string &addStr,
+ ChatTab *const tab)
{
UploadChatInfo *const info = new UploadChatInfo();
Net::Download *const upload = new Net::Download(info,
@@ -1333,6 +1334,7 @@ static void uploadFile(const std::string &str,
info->upload = upload;
info->text = str;
info->addStr = addStr;
+ info->tab = tab;
upload->setFile(fileName);
upload->start();
}
@@ -1341,21 +1343,24 @@ impHandler0(uploadConfig)
{
uploadFile(_("Uploaded config into:"),
config.getFileName(),
- "?xml");
+ "?xml",
+ tab);
}
impHandler0(uploadServerConfig)
{
uploadFile(_("Uploaded server config into:"),
serverConfig.getFileName(),
- "?xml");
+ "?xml",
+ tab);
}
impHandler0(uploadLog)
{
uploadFile(_("Uploaded log into:"),
client->getLogFileName(),
- "?txt");
+ "?txt",
+ tab);
}
impHandler0(testsdlfont)