Version: 1.1.0_devel (using KDE 3.3.1, Gentoo) Compiler: gcc version 3.3.4 20040623 (Gentoo Linux 3.3.4-r1, ssp-3.3.2-2, pie-8.7.6) OS: Linux (i686) release 2.6.8-gentoo-r3 -Load data from an ascii file -go to the change data file dialog, and attempt to change the data file to a new ascii file. The dialog reports 'The file could not be loaded'. It should change the data file to the new one.
CVS commit by staikos: fix reentrancy deadlock in almost all uses of this dialog BUG: 95591 M +2 -1 kstchangefiledialog_i.cpp 1.29 --- kdeextragear-2/kst/kst/kstchangefiledialog_i.cpp #1.28:1.29 @@ -97,5 +97,5 @@ void KstChangeFileDialogI::showChangeFil void KstChangeFileDialogI::applyFileChange() { KstDataSourcePtr file; - KstWriteLocker ml(&KST::dataSourceList.lock()); + KST::dataSourceList.lock().writeLock(); KstDataSourceList::Iterator it = KST::dataSourceList.findFileName(_dataFile->url()); QString invalidSources; @@ -164,4 +164,5 @@ void KstChangeFileDialogI::applyFileChan file->writeUnlock(); file = 0L; + KST::dataSourceList.lock().writeUnlock(); emit docChanged();