Added small fixes and asserts

springlobby · Mar 30, 2016 · 16236a2 · 16236a2
1 parent 4c71fab
commit 16236a2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/downloader/prdownloader.cpp b/src/downloader/prdownloader.cpp
@@ -157,12 +157,15 @@ class DownloadItem : public LSL::WorkItem
 void PrDownloader::GetProgress(DownloadProgress& progress)
 {
 	assert(wxThread::IsMain());
-	if (m_progress == nullptr)
+	if (m_progress == nullptr) {
+		assert(!"m_progress == nullptr");
 		return;
+	}
 	//TODO: add mutex
 	progress.name = m_progress->name;
 	progress.downloaded = m_progress->downloaded;
 	progress.filesize = m_progress->filesize;
+
 	wxLogDebug("%s %d %d", progress.name.c_str(), progress.downloaded, progress.filesize);
 }
 

diff --git a/src/gui/taskbar.cpp b/src/gui/taskbar.cpp
@@ -120,7 +120,7 @@ void TaskBar::UpdateProgress()
 	prDownloader().GetProgress(p);
 
 	int progress = (int)p.GetProgressPercent();
-	text->SetLabel(wxString::Format(_("Downloading %s"), p.name));
+	text->SetLabel(wxString::Format(_("Downloading %s"), TowxString(p.name)));
 	gauge->SetValue(progress);
 }