Merge pull request #973 from vktr/fix/unicode

Fix unicode issues in Add torrent dialog
picotorrent · Oct 12, 2020 · 5a2fb36 · 5a2fb36
2 parents 2bda88b + acad645
commit 5a2fb36
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/picotorrent/ui/dialogs/addtorrentdialog.cpp b/src/picotorrent/ui/dialogs/addtorrentdialog.cpp
@@ -311,12 +311,12 @@ wxString AddTorrentDialog::GetTorrentDisplayName(libtorrent::add_torrent_params
 {
     if (params.ti)
     {
-        return params.ti->name();
+        return Utils::toStdWString(params.ti->name());
     }
 
     if (params.name.size() > 0)
     {
-        return params.name;
+        return Utils::toStdWString(params.name);
     }
 
     std::stringstream hash;

diff --git a/src/picotorrent/ui/mainframe.cpp b/src/picotorrent/ui/mainframe.cpp
@@ -124,7 +124,7 @@ MainFrame::MainFrame(std::shared_ptr<Core::Environment> env, std::shared_ptr<Cor
             auto torrent = static_cast<BitTorrent::TorrentHandle*>(evt.GetClientData());
             m_taskBarIcon->ShowBalloon(
                 i18n("torrent_finished"),
-                torrent->Status().name);
+                Utils::toStdWString(torrent->Status().name));
         });
 
     this->Bind(ptEVT_TORRENT_REMOVED, [this](pt::BitTorrent::InfoHashEvent& evt)