Merge branch 'master' into devel

4 files changed, 8 insertions, 4 deletions

diff --git a/plugins/converter/converter.c b/plugins/converter/converter.c
index e32c38a6..ee25dede 100644
--- a/plugins/converter/converter.c
+++ b/plugins/converter/converter.c
@@ -686,7 +686,7 @@ get_output_path (DB_playItem_t *it, const char *outfolder_user, const char *outf
             char subpath[e-s+1];
             memcpy (subpath, s, e-s);
             subpath[e-s] = 0;
-            snprintf (outfolder_preserve, sizeof (outfolder_preserve), "%s/%s", outfolder_user[0] ? outfolder_user : getenv("HOME"), subpath);
+            snprintf (outfolder_preserve, sizeof (outfolder_preserve), "%s%s", outfolder_user[0] ? outfolder_user : getenv("HOME"), subpath);
         }
     }
 
diff --git a/plugins/converter/convgui.c b/plugins/converter/convgui.c
index d229c811..ad7fa4c4 100644
--- a/plugins/converter/convgui.c
+++ b/plugins/converter/convgui.c
@@ -144,6 +144,10 @@ converter_worker (void *ctx) {
                 char *r = root;
                 while (*path && *r) {
                     if (*path != *r) {
+                        // find new separator
+                        while (r > root && *r != '/') {
+                            r--;
+                        }
                         *r = 0;
                         rootlen = r-root;
                         break;
@@ -153,7 +157,7 @@ converter_worker (void *ctx) {
                 }
             }
         }
-//        fprintf (stderr, "common root path: %s\n", root);
+        fprintf (stderr, "common root path: %s\n", root);
     }
 
     for (int n = 0; n < conv->convert_items_count; n++) {
diff --git a/plugins/shellexec/shellexec.c b/plugins/shellexec/shellexec.c
index b73299f9..c3cc4251 100644
--- a/plugins/shellexec/shellexec.c
+++ b/plugins/shellexec/shellexec.c
@@ -49,7 +49,7 @@
 #include <stdlib.h>
 #include <limits.h>
 
-#include <deadbeef/deadbeef.h>
+#include "../../deadbeef.h"
 #include "shellexec.h"
 
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
diff --git a/plugins/shellexec/shellexec.h b/plugins/shellexec/shellexec.h
index 08fc2279..748340bd 100644
--- a/plugins/shellexec/shellexec.h
+++ b/plugins/shellexec/shellexec.h
@@ -21,7 +21,7 @@
 #ifndef __SHELLEXEC_H
 #define __SHELLEXEC_H
 
-#include <deadbeef/deadbeef.h>
+#include "../../deadbeef.h"
 
 //Probably it's reasonable to move these flags to parent struct
 enum {