From 9d9e34a0c0704388b718619eea0c74e533e178d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Mon, 1 Nov 2010 15:25:28 +0000
Subject: [PATCH] rhbz#648475# crash in scanner dialog, reset link in dtor

---
 extensions/source/scanner/sanedlg.cxx |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index 759c5c8..159c8af 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -134,6 +134,7 @@
 
 SaneDlg::~SaneDlg()
 {
+    mrSane.SetReloadOptionsHdl( maOldLink );
 }
 
 short SaneDlg::Execute()
@@ -480,14 +481,12 @@
 	{
 		double fRes = (double)maReslBox.GetValue();
 		SetAdjustedNumericalValue( "resolution", fRes );
-		mrSane.SetReloadOptionsHdl( maOldLink );
 		UpdateScanArea( TRUE );
 		SaveState();
 		EndDialog( mrSane.IsOpen() ? 1 : 0 );
 	}
 	else if( pButton == &maCancelButton )
 	{
-		mrSane.SetReloadOptionsHdl( maOldLink );
 		mrSane.Close();
 		EndDialog( 0 );
 	}