Index: BUGS.txt
===================================================================
RCS file: /projects/pgadmin3/BUGS.txt,v
retrieving revision 1.60
retrieving revision 1.61
diff -LBUGS.txt -LBUGS.txt -u -w -r1.60 -r1.61
--- BUGS.txt
+++ BUGS.txt
@@ -15,13 +15,13 @@
 <ul>
 	<li>[non-unicode build] Reading unicode files won't convert (wx not capable, use unicode build instead)
 	<li>[Object Tree] M$ Context menu key doesn't work in Windows (wxWindows bug?).
-	<li>[Object Tree] Dropped servers reappear when changing "display system objects" due to the disconnect/tree refresh.
 </ul><br>
 <b>Fixed issues</b>
 <ul>
-    <li>AP 2004-09-18 [Database property] db creation with owner fails [Ted Taylor]
-    <li>AP 2004-09-18 [Server property] some changes not handled correctly [Ted Taylor]
-    <li>AP 2004-09-17 [new Database] Name/Owner not editable for 7.3/7.4 servers [Jona, Ted Taylor]
+    <li>DP 2004-09-18 [Object Tree] Dropped servers reappear when changing "display system objects" due to the disconnect/tree refresh.
+    <li>AP 2004-09-18 [Database property] db creation with owner fails
+    <li>AP 2004-09-18 [Server property] some changes not handled correctly
+    <li>AP 2004-09-17 [new Database] Name/Owner not editable for 7.3/7.4 servers
     <li>DP 2004-09-16 [Server property] password visible when connecting to server [Ivan Nejgebauer]
     <li>AP 2004-09-10 [all] internal types like varchar are quoted when used as type
 	<li>AP 2004-08-15 [Windows] Alt+Tab Icon is system default.
Index: CHANGELOG.txt
===================================================================
RCS file: /projects/pgadmin3/CHANGELOG.txt,v
retrieving revision 1.137
retrieving revision 1.138
diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.137 -r1.138
--- CHANGELOG.txt
+++ CHANGELOG.txt
@@ -17,6 +17,7 @@
 </ul>
 <br>
 <ul>
+    <li>2004-09-18 DP  1.2B2 Prevent dropped servers reappearing after View System Objects change.
     <li>2004-09-17 AP  1.2B2 GRANT for functions in reengineered SQL window
     <li>2004-09-17 AP  1.2B2 Fix Database creation for 7.3/7.4 [Jona]
     <li>2004-09-16 AP  1.2B2 resources: use wxID_xxx IDs to enable GTK wxStockButtons
Index: events.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/events.cpp,v
retrieving revision 1.115
retrieving revision 1.116
diff -Lsrc/ui/events.cpp -Lsrc/ui/events.cpp -u -w -r1.115 -r1.116
--- src/ui/events.cpp
+++ src/ui/events.cpp
@@ -587,6 +587,9 @@
     {
         wxLogInfo(wxT("Clearing treeview to toggle ShowSystemObjects"));
 
+		// Store the servers to prevent dropped ones reappearing in a minute.
+		StoreServers();
+
         // Clear the treeview
         browser->DeleteAllItems();