Changeset 736

Timestamp:

12/6/2008 3:04:15 AM (4 years ago)

Author:

lowjoel

Message:

Fixed crash in Explorer because of the lack of a mechanism to maintain the MenuTitle? pointer.

Location:

branches/eraser6/ShellExt

Files:

• CtxMenu.cpp (modified) (1 diff)
• CtxMenu.h (modified) (1 diff)

branches/eraser6/ShellExt/CtxMenu.cpp

@@ -84 +84 @@
 
 namespace Eraser {
-    wchar_t* CCtxMenu::MenuTitle = NULL;
-
     HRESULT CCtxMenu::FinalConstruct()
     {
         //Initialise member variables.
         MenuID = 0;
-        if (!MenuTitle)
-        {
-            std::wstring menuTitle(LoadString(IDS_ERASER));
-            MenuTitle = new wchar_t[menuTitle.length() + 1];
-            wcscpy_s(MenuTitle, menuTitle.length() + 1, menuTitle.c_str());
-        }
+        std::wstring menuTitle(LoadString(IDS_ERASER));
+        MenuTitle = new wchar_t[menuTitle.length() + 1];
+        wcscpy_s(MenuTitle, menuTitle.length() + 1, menuTitle.c_str());
 
         return S_OK;

branches/eraser6/ShellExt/CtxMenu.h

@@ -88 +88 @@
 
     protected:
-        static wchar_t*             MenuTitle;
-
+        wchar_t*                    MenuTitle;
         InvokeReasons               InvokeReason;
         std::wstring                DragDropDestinationDirectory;