changed .desktop file to use filenames instead of URIs

2 files changed, 12 insertions, 10 deletions

diff --git a/deadbeef.desktop.in b/deadbeef.desktop.in
index bc729a64..17d16ba9 100644
--- a/deadbeef.desktop.in
+++ b/deadbeef.desktop.in
@@ -2,7 +2,7 @@
 Name=Deadbeef
 GenericName=Audio Player
 Comment=Play music
-Exec=deadbeef %U
+Exec=deadbeef %f
 MimeType=application/ogg;audio/x-vorbis+ogg;application/x-ogg;audio/mp3;audio/prs.sid;audio/x-flac;audio/mpeg;audio/x-mpeg;audio/x-mod;audio/x-it;audio/x-s3m;audio/x-xm;
 Categories=AudioVideo;Player;
 Terminal=false
diff --git a/main.c b/main.c
index 3fc1715e..fc079dae 100644
--- a/main.c
+++ b/main.c
@@ -240,17 +240,19 @@ exec_command_line (const char *cmdline, int len, int filter) {
         }
         while (parg < pend) {
             char resolved[PATH_MAX];
-            if (!realpath (parg, resolved)) {
-                fprintf (stderr, "error: cannot expand filename %s, file will not play\n", parg);
+            const char *pname;
+            if (realpath (parg, resolved)) {
+                pname = resolved;
             }
             else {
-                if (pl_add_file (resolved, NULL, NULL) >= 0) {
-                    if (queue) {
-                        exitcode = 3;
-                    }
-                    else {
-                        exitcode = 2;
-                    }
+                pname = parg;
+            }
+            if (pl_add_file (pname, NULL, NULL) >= 0) {
+                if (queue) {
+                    exitcode = 3;
+                }
+                else {
+                    exitcode = 2;
                 }
             }
             parg += strlen (parg);