View | Details | Raw Unified | Return to issue 101245
Collapse All | Expand All

(-)sfx2.orig/source/appl/shutdownicon.cxx (-6 / +9 lines)
Lines 192-198 Link Here
192
		return;
192
		return;
193
	m_bInitialized = true;
193
	m_bInitialized = true;
194
194
195
	(void) LoadModule( &m_pPlugin, &m_pInitSystray, &m_pDeInitSystray );
195
    if (!m_pPlugin)
196
	    (void) LoadModule( &m_pPlugin, &m_pInitSystray, &m_pDeInitSystray );
197
196
	m_bVeto = true;
198
	m_bVeto = true;
197
	m_pInitSystray();
199
	m_pInitSystray();
198
}
200
}
Lines 201-215 Link Here
201
{
203
{
202
	if (!m_bInitialized)
204
	if (!m_bInitialized)
203
		return;
205
		return;
206
204
    if (m_pDeInitSystray)
207
    if (m_pDeInitSystray)
205
		m_pDeInitSystray();
208
		m_pDeInitSystray();
206
209
207
	m_bVeto = false;
210
	m_bVeto = false;
208
	m_pInitSystray = 0;
209
	m_pDeInitSystray = 0;
210
	if (m_pPlugin)
211
		delete m_pPlugin;
212
	m_pPlugin = 0;
213
    delete m_pFileDlg;
211
    delete m_pFileDlg;
214
	m_pFileDlg = NULL;
212
	m_pFileDlg = NULL;
215
	m_bInitialized = false;
213
	m_bInitialized = false;
Lines 233-238 Link Here
233
ShutdownIcon::~ShutdownIcon()
231
ShutdownIcon::~ShutdownIcon()
234
{
232
{
235
	deInitSystray();
233
	deInitSystray();
234
    //Bustage on dlclosing when: no qstarter, start writer, enable, close writer, choose disable/quit
235
    //dlclose gets called and pulls .so from under hack-tower
236
#ifndef UNX
237
	delete m_pPlugin;
238
#endif
236
}
239
}
237
240
238
// ---------------------------------------------------------------------------
241
// ---------------------------------------------------------------------------

Return to issue 101245