From c596940a1517d1d345fb912b340b40a8da01f358 Mon Sep 17 00:00:00 2001
From: Ken Roberts <alisonken1@juno.com>
Date: Thu, 18 Dec 2014 10:50:51 -0800
Subject: [PATCH] Fix notes edit not clearing between calls, added
 projectoreditform tests

---
 openlp/core/ui/projector/editform.py | 7 +++++--
 openlp/core/ui/projector/manager.py  | 5 ++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/openlp/core/ui/projector/editform.py b/openlp/core/ui/projector/editform.py
index 3aaa1cdbd..1d1304a83 100644
--- a/openlp/core/ui/projector/editform.py
+++ b/openlp/core/ui/projector/editform.py
@@ -132,6 +132,8 @@ class Ui_ProjectorEditForm(object):
         self.location_label.setText(translate('OpenLP.ProjectorEditForm', 'Location'))
         self.location_text.setText(self.projector.location)
         self.notes_label.setText(translate('OpenLP.ProjectorEditForm', 'Notes'))
+        self.notes_text.selectAll()
+        self.notes_text.cut()
         self.notes_text.insertPlainText(self.projector.notes)
 
 
@@ -158,7 +160,7 @@ class ProjectorEditForm(QDialog, Ui_ProjectorEditForm):
         self.button_box.helpRequested.connect(self.help_me)
         self.button_box.rejected.connect(self.cancel_me)
 
-    def exec_(self, projector=None):
+    def exec_(self, projector=None, test=False):
         if projector is None:
             self.projector = Projector()
             self.new_projector = True
@@ -167,7 +169,8 @@ class ProjectorEditForm(QDialog, Ui_ProjectorEditForm):
             self.new_projector = False
         self.retranslateUi(self)
         reply = QDialog.exec_(self)
-        self.projector = None
+        if not test:
+            self.projector = None
         return reply
 
     @pyqtSlot()
diff --git a/openlp/core/ui/projector/manager.py b/openlp/core/ui/projector/manager.py
index cac5de46d..4a2c0fe7b 100644
--- a/openlp/core/ui/projector/manager.py
+++ b/openlp/core/ui/projector/manager.py
@@ -562,9 +562,8 @@ class ProjectorManager(OpenLPMixin, RegistryMixin, QWidget, Ui_ProjectorManager,
             return
         self.old_projector = projector
         projector.link.disconnect_from_host()
-        record = self.projectordb.get_projector_by_ip(projector.link.ip)
-        self.projector_form.exec_(record)
-        new_record = self.projectordb.get_projector_by_id(record.id)
+        self.projector_form.exec(projector.db_item)
+        projector.db_item = self.projectordb.get_projector_by_id(self.old_projector.db_item.id)
 
     def on_poweroff_projector(self, opt=None):
         """