r16206 by fschmid - Fixed Bug#9616: "Scribus freezes when importing (Get text) Microsoft Word document into text box", thanks to the patch provided by a_l_e.
scribus-commit
scribus-commit at lists.scribus.net
Sun Jan 2 19:41:32 CET 2011
Author: fschmid
Date: Sun Jan 2 18:41:32 2011
New Revision: 16206
URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16206
Log:
Fixed Bug#9616: "Scribus freezes when importing (Get text) Microsoft Word document into text box", thanks to the patch provided by a_l_e.
Modified:
trunk/Scribus/scribus/plugins/gettext/docim/docim.cpp
Modified: trunk/Scribus/scribus/plugins/gettext/docim/docim.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16206&path=/trunk/Scribus/scribus/plugins/gettext/docim/docim.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/docim/docim.cpp (original)
+++ trunk/Scribus/scribus/plugins/gettext/docim/docim.cpp Sun Jan 2 18:41:32 2011
@@ -112,8 +112,12 @@
failed = true;
return;
}
+ while (proc->waitForReadyRead())
+ {
+ usleep(5000);
+ }
- while(proc->state()==QProcess::Running)
+ while(!proc->atEnd() || proc->state()==QProcess::Running)
{
proc->setReadChannel(QProcess::StandardOutput);
if ( proc->canReadLine() )
More information about the scribus-commit
mailing list