Do repeat in the player rather than trying to do it in VideoDecoder.

[dcpomatic.git] / src / tools / dcpomatic.cc

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 041644d91b21e6b851336dbdaec57a812a6e8110..4b79d67ed028e37d2c69888bb72d97c1475eec14 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -667,7 +667,7 @@ private:
                                _("You are making a DKDM which is encrypted by a private key held in"
                                  "\n\n<tt>%s</tt>\n\nIt is <span weight=\"bold\" size=\"larger\">VITALLY IMPORTANT</span> "
                                  "that you <span weight=\"bold\" size=\"larger\">BACK UP THIS FILE</span> since if it is lost "
-                                 "your DKDMs (and the DCPs they protect) will become useless."), std_to_wx(Config::config_path().string()).data()
+                                 "your DKDMs (and the DCPs they protect) will become useless."), std_to_wx(Config::config_file().string()).data()
                                )
                        );
 
@@ -747,14 +747,14 @@ private:
 #ifdef DCPOMATIC_LINUX
                int r = system ("which nautilus");
                if (WEXITSTATUS (r) == 0) {
-                       r = system (string ("nautilus " + _film->directory()->string()).c_str ());
+                       r = system (String::compose("nautilus \"%1\"", _film->directory()->string()).c_str());
                        if (WEXITSTATUS (r)) {
                                error_dialog (this, _("Could not show DCP (could not run nautilus)"));
                        }
                } else {
                        int r = system ("which konqueror");
                        if (WEXITSTATUS (r) == 0) {
-                               r = system (string ("konqueror " + _film->directory()->string()).c_str ());
+                               r = system (String::compose ("konqueror \"%1\"", _film->directory()->string()).c_str());
                                if (WEXITSTATUS (r)) {
                                        error_dialog (this, _("Could not show DCP (could not run konqueror)"));
                                }
@@ -763,7 +763,7 @@ private:
 #endif
 
 #ifdef DCPOMATIC_OSX
-               int r = system (string ("open -R " + _film->dir (_film->dcp_name (false)).string ()).c_str ());
+               int r = system (String::compose ("open -R \"%1\"", _film->dir (_film->dcp_name(false)).string()).c_str());
                if (WEXITSTATUS (r)) {
                        error_dialog (this, _("Could not show DCP"));
                }