From 3bad03d56eb3116c1ed63dfa3f127f390e0f952e Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Mon, 3 Dec 2012 00:06:25 +0100 Subject: [PATCH] RemotePlugin: improved management of shared memory keys --- include/RemotePlugin.h | 6 ++++-- src/core/RemotePlugin.cpp | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/RemotePlugin.h b/include/RemotePlugin.h index b7cc5b8ef..87bb3a28b 100644 --- a/include/RemotePlugin.h +++ b/include/RemotePlugin.h @@ -1101,13 +1101,15 @@ void RemotePluginClient::setShmKey( key_t _key, int _size ) { #ifdef USE_QT_SHMEM m_shmObj.setKey( QString::number( _key ) ); - if( m_shmObj.attach() ) + if( m_shmObj.attach() || m_shmObj.error() == QSharedMemory::NoError ) { m_shm = (float *) m_shmObj.data(); } else { - debugMessage( "failed getting shared memory\n" ); + char buf[64]; + sprintf( buf, "failed getting shared memory: %d\n", m_shmObj.error() ); + debugMessage( buf ); } #else if( m_shm != NULL ) diff --git a/src/core/RemotePlugin.cpp b/src/core/RemotePlugin.cpp index 55fe5309e..dd6a237dd 100644 --- a/src/core/RemotePlugin.cpp +++ b/src/core/RemotePlugin.cpp @@ -314,7 +314,7 @@ void RemotePlugin::resizeSharedProcessingMemory() #endif } - int shm_key = 0; + static int shm_key = 0; #ifdef USE_QT_SHMEM do {