Merge commit '515673c08f8718a237e90c2130a1f5294f966d6a'

[xonotic/netradiant.git] / radiant / findtexturedialog.cpp

diff --git a/radiant/findtexturedialog.cpp b/radiant/findtexturedialog.cpp
index f84338b35a9d9f55503b200be4412ada256b7fc8..52891d808c77fc4cb5df2089ad43f2fa1faaeb13 100644 (file)
--- a/radiant/findtexturedialog.cpp
+++ b/radiant/findtexturedialog.cpp
@@ -60,6 +60,7 @@ class FindTextureDialog : public Dialog
   static void setFindStr(const char* name);
   static bool isOpen();
   static void show();
+  typedef FreeCaller<&FindTextureDialog::show> ShowCaller;
   static void updateTextures(const char* name);
 
   FindTextureDialog();
@@ -90,8 +91,9 @@ namespace
   void FindTextureDialog_apply()
   {
     StringOutputStream find(256);
-    find << "textures/" << g_FindTextureDialog.m_strFind.c_str();
     StringOutputStream replace(256);
+
+    find << "textures/" << g_FindTextureDialog.m_strFind.c_str();
     replace << "textures/" << g_FindTextureDialog.m_strReplace.c_str();
     FindReplaceTextures(find.c_str(), replace.c_str(), g_FindTextureDialog.m_bSelectedOnly);
   }
@@ -290,7 +292,7 @@ void FindTextureDialog_selectTexture(const char* name)
 
 void FindTextureDialog_Construct()
 {
-  GlobalCommands_insert("FindReplaceTextures", FreeCaller<FindTextureDialog::show>());
+  GlobalCommands_insert("FindReplaceTextures", FindTextureDialog::ShowCaller());
 }
 
 void FindTextureDialog_Destroy()