bugfix: Panel Elements

Panel elements can only get killed when panel is closing.
Re-Opening the Experiment with an Open CodeBrowser Panel leads otherwise
to Igor complaining about non-existing variable-references.

Author: Matthias Kastner

procedures/CodeBrowser.ipf

@@ -896,13 +896,10 @@ Function searchReset()
 End
 
 Function DeletePKGfolder()
-	Wave/T decl = getDeclWave()
-	Wave/I line = getLineWave()
-
-	KillWaves/Z decl, line
-	KillDataFolder/Z $pkgFolder
-
-	if(!CountObjects("root:Packages", 4))
+	if(CountObjects(pkgFolder, 1) + CountObjects(pkgFolder, 2) + CountObjects(pkgFolder, 3) == 0)
+		KillDataFolder/Z $pkgFolder
+	endif
+	if(CountObjects("root:Packages", 4) == 0)
 		KillDataFolder root:Packages
 	endif
 End

procedures/CodeBrowser_hooks.ipf

@@ -86,14 +86,20 @@ Function preparePanelClose()
 	if(prefs.configCleanOnExit)
 		// storage data will not be saved in experiment
 		saveResetStorage()
-		killGlobalStr("search")
 		killGlobalVar("cleanOnExit")
 		killGlobalVar("debuggingEnabled")
-		// clean Package DataFolder
-		DeletePKGfolder()
 	endif
 End
 
+// if panel does not exist, delete panel-bound var/wave/dfr
+Function killPanelRelatedObjects()
+	Wave/T decl = getDeclWave()
+	Wave/I line = getLineWave()
+
+	KillWaves/Z decl, line
+	killGlobalStr("search")
+End
+
 Function panelHook(s)
 	STRUCT WMWinHookStruct &s
 
@@ -109,6 +115,8 @@ Function panelHook(s)
 			break
 		case 2:				// kill
 			preparePanelClose()
+			killPanelRelatedObjects()
+			DeletePKGfolder()
 			hookResult = 1
 			break
 		case 6:				// resize