From b338e29fd3eaf700f8c8360aa0310048ba941d54 Mon Sep 17 00:00:00 2001
From: Daniel Wilhelm <daniel@wili.li>
Date: Fri, 18 Apr 2014 17:12:46 +0200
Subject: 3.19

---
 shared/taskbar.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'shared/taskbar.cpp')

diff --git a/shared/taskbar.cpp b/shared/taskbar.cpp
index 5767f8c9..969f4bb0 100644
--- a/shared/taskbar.cpp
+++ b/shared/taskbar.cpp
@@ -33,16 +33,13 @@ bool windows7TaskbarAvailable()
 }
 
 
-const std::wstring& getTaskBarDllName()
+std::wstring getTaskBarDllName()
 {
     assert_static(util::is32BitBuild || util::is64BitBuild);
 
-    static const std::wstring filename(
-        util::is64BitBuild ?
-        L"Taskbar7_x64.dll" :
-        L"Taskbar7_Win32.dll");
-
-    return filename;
+    return util::is64BitBuild ?
+           L"Taskbar7_x64.dll" :
+           L"Taskbar7_Win32.dll";
 }
 }
 //########################################################################################################
@@ -108,7 +105,7 @@ private:
 
 TaskbarProgress::TaskbarProgress(const wxTopLevelWindow& window) : pimpl_(new Pimpl(window)) {}
 
-TaskbarProgress::~TaskbarProgress() {} //std::auto_ptr ...
+TaskbarProgress::~TaskbarProgress() {} //std::unique_ptr ...
 
 void TaskbarProgress::setStatus(Status status)
 {
-- 
cgit