Merge branch 'master' into root6

2016-04-26 12:58:50 +02:00
parent 0eb017c946 af7b729a5a
commit 95ac103605
42 changed files with 886 additions and 617 deletions
--- a/src/musredit_qt5/PTextEdit.cpp
+++ b/src/musredit_qt5/PTextEdit.cpp
@@ -2184,6 +2184,9 @@ void PTextEdit::musrView()
  cmd = str + " \"";

  str = *fFilenames.find( currentEditor() );
+  int pos = str.lastIndexOf("/");
+  if (pos != -1)
+    str.remove(0, pos+1);
  QString numStr;
  numStr.setNum(fAdmin->getTimeout());
  cmd += str + "\" --timeout " + numStr;
@@ -2192,6 +2195,10 @@ void PTextEdit::musrView()
  cmd += " &";

  int status=system(cmd.toLatin1());
+
+  if (status != 0) {
+    cerr << "**WARNING** musrView: something went wrong ..." << endl;
+  }
 }

 //----------------------------------------------------------------------------------------------------