anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Andreas' "in_show" fix to bug 1119.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9661 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2005-02-22 10:25:42 +00:00
parent 7e5e172ac0
commit 832a46885a
3 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/frontends/ChangeLog
View File

@ -1,3 +1,8 @@
2005-02-21 Andreas Vox <vox@isp.uni-luebeck.de>
* Dialogs.[hC] (show): prevent show() from getting called
recursively.
2005-02-11 John Levon <levon@movementarian.org>
* screen.C: clarify comment about event queue magic

22
src/frontends/Dialogs.C
View File

@ -65,7 +65,7 @@ void Dialogs::hide(string const & name, InsetBase* inset)
Dialogs::Dialogs(LyXView & lyxview)
: lyxview_(lyxview)
: lyxview_(lyxview), in_show_(false)
{
// Connect signals
redrawGUI().connect(boost::bind(&Dialogs::redraw, this));
@ -90,24 +90,32 @@ Dialog * Dialogs::find_or_build(string const & name)
void Dialogs::show(string const & name, string const & data)
{
Dialog * dialog = find_or_build(name);
if (!dialog)
if (in_show_) {
return;
}
in_show_ = true;
Dialog * dialog = find_or_build(name);
if (dialog) {
// FIXME! Should check that the dialog is NOT an inset dialog.
dialog->show(data);
}
in_show_ = false;
}
void Dialogs::show(string const & name, string const & data, InsetBase * inset)
{
Dialog * dialog = find_or_build(name);
if (!dialog)
if (in_show_) {
return;
}
in_show_ = true;
Dialog * dialog = find_or_build(name);
if (dialog) {
// FIXME! Should check that the dialog IS an inset dialog.
dialog->show(data);
open_insets_[name] = inset;
}
in_show_ = false;
}

3
src/frontends/Dialogs.h
View File

@ -117,6 +117,9 @@ private:
///
std::map<std::string, DialogPtr> dialogs_;
/// flag against a race condition due to multiclicks in Qt frontend, see bug #1119
bool in_show_;
};
#endif