Windows: curv -le works, without setting CURV_EDITOR

ComFreek · Jul 15, 2020 · 45a152f · 45a152f
1 parent 23ad34a
commit 45a152f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/curv/curv.cc b/curv/curv.cc
@@ -195,7 +195,7 @@ main(int argc, char** argv)
             break;
         case 'e':
             editor = getenv("CURV_EDITOR");
-            if (editor == nullptr)
+            if (editor == nullptr || *editor == '\0')
             {
 #ifdef _WIN32
                 editor = "notepad";

diff --git a/curv/livemode.cc b/curv/livemode.cc
@@ -99,7 +99,9 @@ launch_editor(const char* editor, const char* filename)
     if (!createProcessSuccess)
     {
         DWORD error = GetLastError();
-        throw curv::Exception_Base(curv::stringify("Could not launch editor: ", curv::win_strerror(error)));
+        throw curv::Exception_Base(curv::stringify(
+	    "Could not launch editor (", editor_commandline, "): ",
+	    curv::win_strerror(error)));
     }
 
     // Close this handle right away as we only need proc_info.hProcess in poll_editor()