Mercurial > hg > octave-nkf
diff libgui/src/m-editor/file-editor.cc @ 20296:23fb65b45d8c
do not call custom editor at startup and when debugging (bug #44701)
* file-editor.cc (call_custom_editor): return with true but without opening
a file;
(empty_script): do not open an empty script in the cutom editor
at startup
| author | Torsten <ttl@justmail.de> |
|---|---|
| date | Fri, 17 Apr 2015 19:55:24 +0200 |
| parents | 17d79913f065 |
| children |
line wrap: on
line diff
--- a/libgui/src/m-editor/file-editor.cc +++ b/libgui/src/m-editor/file-editor.cc @@ -272,6 +272,9 @@ if (settings->value ("useCustomFileEditor",false).toBool ()) { + if (line > -1) // check for a specific line (debugging) + return true; // yes: do ont open a file in external editor + QString editor = settings->value ("customFileEditor").toString (); editor.replace ("%f", file_name); editor.replace ("%l", QString::number (line)); @@ -1916,6 +1919,10 @@ void file_editor::empty_script (bool startup, bool visible) { + QSettings *settings = resource_manager::get_settings (); + if (settings->value ("useCustomFileEditor",false).toBool ()) + return; // do not open an empty script in the external editor + bool real_visible; if (startup)