mirror of
https://bitbucket.org/smil3y/kdelibs.git
synced 2025-02-23 10:22:48 +00:00
kinit: ensure the startup timeout is atleast 1 second
has to be done in the KCM too Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
50a9aa403b
commit
06654a1bbd
1 changed files with 3 additions and 3 deletions
|
@ -43,8 +43,8 @@ static const int s_sleeptime = 50;
|
|||
// kde-workspace/kwin/effects/startupfeedback/startupfeedback.cpp
|
||||
// kde-workspace/kcontrol/launch/kcmlaunch.cpp
|
||||
static const qint64 s_startuptimeout = 10; // 10sec
|
||||
// klauncher is the last process to quit in a session so 5sec for each child process is more than
|
||||
// enough
|
||||
// klauncher is one of the last processes to quit in a session so 5sec for each child process is
|
||||
// more than enough
|
||||
static const qint64 s_processtimeout = 5000; // 5sec
|
||||
|
||||
static inline void removeTemp(const bool temp, const QStringList &args)
|
||||
|
@ -221,7 +221,7 @@ KLauncherAdaptor::KLauncherAdaptor(QObject *parent)
|
|||
KConfig klauncherconfig("klaunchrc", KConfig::NoGlobals);
|
||||
KConfigGroup kconfiggroup = klauncherconfig.group("BusyCursorSettings");
|
||||
const int busytimeout = kconfiggroup.readEntry("Timeout", s_startuptimeout);
|
||||
m_startuptimeout = (busytimeout * 1000);
|
||||
m_startuptimeout = (qMax(busytimeout, 1) * 1000);
|
||||
}
|
||||
|
||||
KLauncherAdaptor::~KLauncherAdaptor()
|
||||
|
|
Loading…
Add table
Reference in a new issue