Fixed activating file from the command line after project path is set (#829, #830).

Author: pkulchenko

src/editor/singleinstance.lua

@@ -69,7 +69,8 @@ else -- something different is running on our port
     else
       local failed = false
       for _, filename in ipairs(ide.filenames) do
-        cln:send(protocol.client.requestloading:format(ide:MergePath(ide.cwd or "", filename)))
+        cln:send(protocol.client.requestloading
+          :format(ide.cwd and GetFullPathIfExists(ide.cwd, filename) or filename))
 
         local msg, err = cln:receive()
         if msg ~= protocol.server.answerok then

src/main.lua

@@ -616,7 +616,7 @@ SettingsRestoreView()
 
 do
   for _, filename in ipairs(ide.filenames) do
-    ide:ActivateFile(ide:MergePath(ide.cwd or "", filename))
+    ide:ActivateFile(ide.cwd and GetFullPathIfExists(ide.cwd, filename) or filename)
   end
   if ide:GetEditorNotebook():GetPageCount() == 0 then NewFile() end
 end