Changeset 2126

Timestamp:

5/15/2010 12:34:09 PM (3 years ago)

Author:

lowjoel

Message:

When creating the command line, check all paths to ensure that the last character is not a \, otherwise we need to escape it (otherwise the command line is garbled)

File:

• trunk/eraser/Eraser.Shell/CtxMenu.cpp (modified) (4 diffs)

trunk/eraser/Eraser.Shell/CtxMenu.cpp

@@ -556 +556 @@
             }
 
+            if (*DragDropDestinationDirectory.rbegin() == '\\')
+                DragDropDestinationDirectory += '\\';
             commandLine += L"\"/destination=" + DragDropDestinationDirectory + L"\"";
             break;
@@ -562 +564 @@
             {
                 //Set the destination for the paste operation.
+                if (*DragDropDestinationDirectory.rbegin() == '\\')
+                    DragDropDestinationDirectory += '\\';
                 commandLine += L"\"/destination=" + DragDropDestinationDirectory + L"\"";
 
@@ -592 +596 @@
             i != SelectedFiles.end(); ++i)
         {
-            commandLine += L"\"" + *i + L"\" ";
+            std::wstring path(*i);
+            if (path[path.length() - 1] == '\\')
+                path += '\\';
+            commandLine += L" \"" + path + L"\"";
         }
 
@@ -1032 +1039 @@
                 finalParameters).c_str());
 
+            MessageBox(NULL, &buffer.front(), L"", MB_OK);
             if (!CreateProcess(NULL, &buffer.front(), NULL, NULL, true, CREATE_NO_WINDOW,
                 NULL, NULL, &startupInfo, &processInfo))