Skip to content

Commit bd8cf86

Browse files
committed
found another location where the file watcher is turned on
1 parent f95ed92 commit bd8cf86

2 files changed

Lines changed: 13 additions & 9 deletions

File tree

app/src/processing/app/Editor.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
/*
44
Part of the Processing project - http://processing.org
55
6+
Copyright (c) 2012-14 The Processing Foundation
67
Copyright (c) 2004-12 Ben Fry and Casey Reas
78
Copyright (c) 2001-04 Massachusetts Institute of Technology
89
@@ -2586,16 +2587,16 @@ public boolean handleSaveAs() {
25862587
statusNotice(Language.text("editor.status.saving"));
25872588
try {
25882589
if (sketch.saveAs()) {
2589-
//a saveAs moves where the files are, so a listener must be attached to the new location
2590-
initFileChangeListener();
2590+
// Disabling for 3.0a4
2591+
if (false && Preferences.getBoolean("editor.watcher")) {
2592+
// "Save As" moves where the files are, so a listener must be
2593+
// attached to the new location.
2594+
// TODO shouldn't this remove the old listener?
2595+
initFileChangeListener();
2596+
}
25912597
// statusNotice("Done Saving.");
2592-
// status is now printed from Sketch so that "Done Saving."
2593-
// is only printed after Save As when progress bar is shown.
2594-
2595-
// Disabling this for 0125, instead rebuild the menu inside
2596-
// the Save As method of the Sketch object, since that's the
2597-
// only one who knows whether something was renamed.
2598-
//sketchbook.rebuildMenusAsync();
2598+
// status is now printed from Sketch so that "Done Saving."
2599+
// is only printed after Save As when progress bar is shown.
25992600
} else {
26002601
statusNotice(Language.text("editor.status.saving.canceled"));
26012602
return false;

build/shared/revisions.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ until all those issues are sorted out.
1717
+ The OS X default File menu (shown when no windows are open) now has the
1818
order/naming changes found in the sketch window File menu.
1919

20+
+ Turning off file watching because of errant "this sketch has changed"
21+
messages. Hopefully this will return soon.
22+
https://github.com/processing/processing/issues/2852
2023

2124
[ bug fixes ]
2225

0 commit comments

Comments
 (0)