Summary: | after deleting activ icontheme starting kcontol icons crashes | ||
---|---|---|---|
Product: | kcontrol | Reporter: | Ferdinand Gassauer <gassauer> |
Component: | kcmicons | Assignee: | Marie Loise Nolden <nolden> |
Status: | RESOLVED FIXED | ||
Severity: | crash | CC: | fboudra |
Priority: | NOR | ||
Version: | unspecified | ||
Target Milestone: | --- | ||
Platform: | unspecified | ||
OS: | Linux | ||
Latest Commit: | Version Fixed In: |
Description
Ferdinand Gassauer
2003-10-14 20:00:56 UTC
moved my $KDE_HOME and now everything works again old config files are available for further investigation *** Bug 66036 has been marked as a duplicate of this bug. *** CVS commit by waba: Don't crash when there is no valid icon theme (BR66034) CCMAIL: 66034-done@bugs.kde.org M +24 -6 icons.cpp 1.33.2.1 --- kdebase/kcontrol/icons/icons.cpp #1.33:1.33.2.1 @@ -166,4 +166,6 @@ void KIconConfig::initDefaults() mDefaultEffect[2].color = QColor(34,202,0); + const int defDefSizes[] = { 32, 22, 22, 16, 32 }; + KIcon::Group i; QStringList::ConstIterator it; @@ -173,5 +175,8 @@ void KIconConfig::initDefaults() mbChanged[i] = true; mbAnimated[i] = false; + if (mpTheme) mSizes[i] = mpTheme->defaultSize(i); + else + mSizes[i] = defDefSizes[i]; mEffects[i][0] = mDefaultEffect[0]; @@ -206,4 +211,6 @@ void KIconConfig::initDefaults() void KIconConfig::read() { + if (mpTheme) + { for (KIcon::Group i=KIcon::FirstGroup; i<KIcon::LastGroup; i++) mAvSizes[i] = mpTheme->querySizes(i); @@ -211,4 +218,15 @@ void KIconConfig::read() mTheme = mpTheme->current(); mExample = mpTheme->example(); + } + else + { + const int defDefSizes[] = { 32, 22, 22, 16, 32 }; + + for (KIcon::Group i=KIcon::FirstGroup; i<KIcon::LastGroup; i++) + mAvSizes[i] = QValueList<int>(); // << defDefSizes[i]); + + mTheme = QString::null; + mExample = QString::null; + } initDefaults(); |