vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed a bug where a file was loaded twice when auto reload was on

epec-fast
Marius Kintel 2013-06-04 21:15:01 -04:00
parent 85c83fbc04
commit 3e024822e6
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mainwin.cc
View File

@ -511,7 +511,8 @@ MainWindow::openFile(const QString &new_filename)
}
#endif
setFileName(actual_filename);
fileChangedOnDisk(); // force cached autoReloadId to update
refreshDocument();
updateRecentFiles();
if (actual_filename.isEmpty()) {
@ -627,10 +628,17 @@ void MainWindow::compile(bool reload, bool forcedone)
// Reload checks the timestamp of the toplevel file and refreshes if necessary,
if (reload) {
// Refresh files if it has changed on disk
if (fileChangedOnDisk() && checkEditorModified()) {
shouldcompiletoplevel = true;
refreshDocument();
}
// If the file hasn't changed, we might still need to compile it
// if we haven't yet compiled the current text.
else {
QString current_doc = editor->toPlainText();
if (current_doc != last_compiled_doc) shouldcompiletoplevel = true;
}
}
else {
shouldcompiletoplevel = true;
@ -1052,7 +1060,10 @@ void MainWindow::actionShowLibraryFolder()
void MainWindow::actionReload()
{
if (checkEditorModified()) refreshDocument();
if (checkEditorModified()) {
fileChangedOnDisk(); // force cached autoReloadId to update
refreshDocument();
}
}
void MainWindow::hideEditor()