diff options
| author | Michele Calgaro <[email protected]> | 2020-02-24 13:12:45 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2020-02-24 13:12:45 +0900 |
| commit | 70194b269e22711c3bbbc18d339b69aab028371e (patch) | |
| tree | 9a2041fa538a32a53261ae692b03551202834007 /src | |
| parent | 2135f14eef3d1058e0a0006a9db52a30d4511863 (diff) | |
| download | tdedocker-70194b269e22711c3bbbc18d339b69aab028371e.tar.gz tdedocker-70194b269e22711c3bbbc18d339b69aab028371e.zip | |
1. Fixed SEGV caused by missing TDE icon loader object. When the
applicationi is transformed in a TDE application, the TDE icon loader
can be used again.
2. Remove catching of SEGV in code, which was causing 100% CPU load. If something is wrong, better the
program terminates and shows an error.
Signed-off-by: Michele Calgaro <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/customtraylabel.cpp | 7 | ||||
| -rw-r--r-- | src/main.cpp | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/customtraylabel.cpp b/src/customtraylabel.cpp index 83b89ea..a657a89 100644 --- a/src/customtraylabel.cpp +++ b/src/customtraylabel.cpp @@ -56,8 +56,9 @@ CustomTrayLabel::CustomTrayLabel(const TQStringList& argv, pid_t pid, */ void CustomTrayLabel::installMenu() { - TQPixmap kdocker_png(TDEGlobal::iconLoader()->loadIcon("kdocker", TDEIcon::NoGroup, TDEIcon::SizeSmall)); - setIcon(kdocker_png); + //TQPixmap kdocker_png(TDEGlobal::iconLoader()->loadIcon("kdocker", TDEIcon::NoGroup, TDEIcon::SizeSmall)); + TQPixmap *kdocker_png = new TQPixmap("kdocker"); + setIcon(*kdocker_png); TrayLabelMgr *tlMgr = TrayLabelMgr::instance(); mOptionsMenu = new TQPopupMenu(this); @@ -105,7 +106,7 @@ void CustomTrayLabel::installMenu() mSkipTaskbar->addTo(mOptionsMenu); mMainMenu = new TQPopupMenu(this); - mMainMenu->insertItem(TQIconSet(kdocker_png), + mMainMenu->insertItem(TQIconSet(*kdocker_png), i18n("About KDocker"), tlMgr, SLOT(about())); mMainMenu->insertSeparator(); mMainMenu->insertItem(i18n("Options"), mOptionsMenu); diff --git a/src/main.cpp b/src/main.cpp index 4dd0b6f..d1e0a38 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -48,7 +48,6 @@ int main(int argc, char *argv[]) { // setup signal handlers that undock and quit signal(SIGHUP, sighandler); - signal(SIGSEGV, sighandler); signal(SIGTERM, sighandler); signal(SIGINT, sighandler); signal(SIGUSR1, sighandler); |