[Libreoffice-commits] core.git: sd/source

[Michael Meeks]

 sd/source/ui/dlg/RemoteDialog.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 535dd86dfa4fbe0f2555205cb925586176267800
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Wed Feb 6 17:21:41 2013 +0000

    fdo#58699 - sdremote - fix it so it closes even with no bluetooth.
    
    Change-Id: I09588f4e4b22466843f855d99c06f616c04518ac

diff --git a/sd/source/ui/dlg/RemoteDialog.cxx b/sd/source/ui/dlg/RemoteDialog.cxx
index b41db5e76..d98eda7 100644
--- a/sd/source/ui/dlg/RemoteDialog.cxx
+++ b/sd/source/ui/dlg/RemoteDialog.cxx
@@ -27,9 +27,10 @@ RemoteDialog::RemoteDialog( Window *pWindow ) :
 {
     (void) mPreviouslyDiscoverable; // avoid warnings about unused member
 
-#ifdef ENABLE_SDREMOTE
     FreeResource();
 
+#ifdef ENABLE_SDREMOTE
+
 #ifdef ENABLE_SDREMOTE_BLUETOOTH
     mPreviouslyDiscoverable = RemoteServer::isBluetoothDiscoverable();
     if ( !mPreviouslyDiscoverable )
@@ -45,11 +46,11 @@ RemoteDialog::RemoteDialog( Window *pWindow ) :
     {
         mClientBox.addEntry( *aIt );
     }
+#endif
 
     mButtonConnect.SetClickHdl( LINK( this, RemoteDialog, HandleConnectButton ) );
     SetCloseHdl( LINK( this, RemoteDialog, CloseHdl ) );
     mButtonCancel.SetClickHdl( LINK( this, RemoteDialog, CloseHdl ) );
-#endif
 }
 
 RemoteDialog::~RemoteDialog()
@@ -87,8 +88,8 @@ IMPL_LINK_NOARG( RemoteDialog, CloseHdl )
     {
         RemoteServer::setBluetoothDiscoverable( false );
     }
-    Close();
 #endif
+    Close();
     return 0;
 }