summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/pb_controller.cpp6
-rw-r--r--src/queueloader.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/pb_controller.cpp b/src/pb_controller.cpp
index e46594f3..a6581f5e 100644
--- a/src/pb_controller.cpp
+++ b/src/pb_controller.cpp
@@ -367,9 +367,9 @@ void pb_controller::play_file(const std::string& file) {
if (player == "")
return;
cmdline.append(player);
- cmdline.append(" \"");
- cmdline.append(utils::replace_all(file,"\"", "\\\""));
- cmdline.append("\"");
+ cmdline.append(" '");
+ cmdline.append(utils::replace_all(file,"'", "%27"));
+ cmdline.append("'");
stfl::reset();
utils::run_interactively(cmdline, "pb_controller::play_file");
}
diff --git a/src/queueloader.cpp b/src/queueloader.cpp
index 15047b6e..980f185d 100644
--- a/src/queueloader.cpp
+++ b/src/queueloader.cpp
@@ -130,7 +130,7 @@ std::string queueloader::get_filename(const std::string& str) {
strftime(lbuf, sizeof(lbuf), "%Y-%b-%d-%H%M%S.unknown", localtime(&t));
fn.append(lbuf);
} else {
- fn.append(base);
+ fn.append(utils::replace_all(base, "'", "%27"));
}
return fn;
}