[SHELL32] CDefViewBckgrndMenu: Fix a crash when pasting on a new explorer window.

diff --git a/dll/win32/shell32/CDefViewBckgrndMenu.cpp b/dll/win32/shell32/CDefViewBckgrndMenu.cpp
index 281366a..2fc6f1a 100644 (file)
--- a/dll/win32/shell32/CDefViewBckgrndMenu.cpp
+++ b/dll/win32/shell32/CDefViewBckgrndMenu.cpp
@@ -210,7 +210,12 @@ CDefViewBckgrndMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi)
     UINT idCmd = LOWORD(lpcmi->lpVerb);
     if(HIWORD(lpcmi->lpVerb) != 0 || idCmd < m_LastFolderCMId)
     {
     UINT idCmd = LOWORD(lpcmi->lpVerb);
     if(HIWORD(lpcmi->lpVerb) != 0 || idCmd < m_LastFolderCMId)
     {

-        return m_folderCM->InvokeCommand(lpcmi);
+        if (m_folderCM)
+        {
+            return m_folderCM->InvokeCommand(lpcmi);
+        }
+        WARN("m_folderCM is NULL!\n");
+        return E_NOTIMPL;

     }
 
     /* The default part of the background menu doesn't have shifted ids so we need to convert the id offset to the real id */
     }
 
     /* The default part of the background menu doesn't have shifted ids so we need to convert the id offset to the real id */


@@ -221,8 +226,13 @@ CDefViewBckgrndMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi)
     {
     case FCIDM_SHVIEW_INSERT:
     case FCIDM_SHVIEW_INSERTLINK:
     {
     case FCIDM_SHVIEW_INSERT:
     case FCIDM_SHVIEW_INSERTLINK:

-        lpcmi->lpVerb = MAKEINTRESOURCEA(idCmd);
-        return m_folderCM->InvokeCommand(lpcmi);
+        if (m_folderCM)
+        {
+            lpcmi->lpVerb = MAKEINTRESOURCEA(idCmd);
+            return m_folderCM->InvokeCommand(lpcmi);
+        }
+        WARN("m_folderCM is NULL!\n");
+        return E_NOTIMPL;

     case FCIDM_SHVIEW_BIGICON:
     case FCIDM_SHVIEW_SMALLICON:
     case FCIDM_SHVIEW_LISTVIEW:
     case FCIDM_SHVIEW_BIGICON:
     case FCIDM_SHVIEW_SMALLICON:
     case FCIDM_SHVIEW_LISTVIEW: