diff -Nru ubuntustudio-controls-0.4.4ubuntu1/debian/changelog ubuntustudio-controls-0.4.4ubuntu2/debian/changelog
--- ubuntustudio-controls-0.4.4ubuntu1/debian/changelog	2009-04-16 00:11:40.000000000 -0400
+++ ubuntustudio-controls-0.4.4ubuntu2/debian/changelog	2009-07-05 14:49:05.000000000 -0400
@@ -1,3 +1,9 @@
+ubuntustudio-controls (0.4.4ubuntu2) karmic; urgency=low
+
+  * Ensure lock file is removed on window close. (LP: #395807)
+
+ -- Thomas E Jenkins <thomas.jenkins@gmail.com>  Sun, 05 Jul 2009 14:47:35 -0400
+
 ubuntustudio-controls (0.4.4ubuntu1) jaunty; urgency=low
 
   * Fixed writing/rewriting raw1394 permission issue LP: #360895
diff -Nru ubuntustudio-controls-0.4.4ubuntu1/src/ubuntustudio-controls ubuntustudio-controls-0.4.4ubuntu2/src/ubuntustudio-controls
--- ubuntustudio-controls-0.4.4ubuntu1/src/ubuntustudio-controls	2009-04-16 00:11:40.000000000 -0400
+++ ubuntustudio-controls-0.4.4ubuntu2/src/ubuntustudio-controls	2009-07-05 14:46:59.000000000 -0400
@@ -38,8 +38,8 @@
     self.raw1394Warning = self.wTree.get_widget("raw_dialog")
 
     #Create our dictionay and connect it
-    dic = { "on_closeButton_clicked" : self.closeButton_clicked,
-            "on_mainWindow_destroy" : gtk.main_quit,
+    dic = { "on_closeButton_clicked" : self.close_window,
+            "on_mainWindow_destroy" : self.close_window,
             "on_about_button_clicked" : self.about,
             "on_apply_button_clicked" : self.apply_settings,
             "on_memlock_spinbutton_value_changed" : self.update_memlock_amount,
@@ -72,7 +72,8 @@
   zap = DontZap()
   
     
-  def closeButton_clicked(self, widget):
+  def close_window(self, widget):
+    os.remove('/var/lock/ubuntustudio-controls')
     gtk.main_quit()
 
   def about(self, widget):
@@ -200,4 +201,3 @@
       uscontrols.serialize_settings()
     gtk.main()
     uscontrols.serialize_settings()
-    os.remove('/var/lock/ubuntustudio-controls')