From 35b1fc8e97aba1fecdbb7f850494d7899ccf088d Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Mon, 30 Jun 2008 16:52:23 +0000 Subject: [PATCH] made initialization of dummy-plugin pixmap-loder static git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1231 0778d3d1-df1d-0410-868b-ea421aaaa00d --- src/core/plugin.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/core/plugin.cpp b/src/core/plugin.cpp index 07605ba55..cfee1134f 100644 --- a/src/core/plugin.cpp +++ b/src/core/plugin.cpp @@ -38,6 +38,8 @@ #include "dummy_plugin.h" +static pixmapLoader __dummy_loader; + static plugin::descriptor dummy_plugin_descriptor = { "dummy", @@ -46,22 +48,18 @@ static plugin::descriptor dummy_plugin_descriptor = "Tobias Doerffel ", 0x0100, plugin::Undefined, - NULL, + &__dummy_loader, NULL } ; + plugin::plugin( const descriptor * _descriptor, model * _parent ) : journallingObject(), model( _parent ), m_descriptor( _descriptor ) { - if( dummy_plugin_descriptor.logo == NULL ) - { - dummy_plugin_descriptor.logo = new pixmapLoader; - } - if( m_descriptor == NULL ) { m_descriptor = &dummy_plugin_descriptor;