status-im
/
snorenotify
mirror of https://github.com/status-im/snorenotify.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't crash if attatching to shared memory failed.

This commit is contained in:
Patrick von Reth 2015-09-08 17:16:45 +02:00
parent b81410f27c
commit 9b83db0420
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/backends/snore/notifywidget.cpp
View File

@ -65,12 +65,13 @@ NotifyWidget::NotifyWidget(int pos, const SnoreNotifier *parent) :
m_mem.unlock(); m_mem.unlock();
} else { } else {
if (!m_mem.attach()) { if (!m_mem.attach()) {
qFatal("Failed to atatche to shared mem"); snoreDebug(SNORE_WARNING) << "Failed to atatche to shared mem";
} else {
m_mem.lock();
SHARED_MEM_TYPE *data = (SHARED_MEM_TYPE *)m_mem.data();
m_mem.unlock();
snoreDebug(SNORE_DEBUG) << "Status" << data->free << data->date.elapsed() / 1000;
} }
m_mem.lock();
SHARED_MEM_TYPE *data = (SHARED_MEM_TYPE *)m_mem.data();
m_mem.unlock();
snoreDebug(SNORE_DEBUG) << "Status" << data->free << data->date.elapsed() / 1000;
} }
setResizeMode(QQuickView::SizeViewToRootObject); setResizeMode(QQuickView::SizeViewToRootObject);
@ -110,6 +111,9 @@ void NotifyWidget::display(const Notification &notification)
bool NotifyWidget::acquire() bool NotifyWidget::acquire()
{ {
if (!m_mem.isAttached()) {
return true;
}
bool out = false; bool out = false;
if (m_ready) { if (m_ready) {
m_mem.lock(); m_mem.lock();
@ -132,6 +136,9 @@ bool NotifyWidget::acquire()
bool NotifyWidget::release() bool NotifyWidget::release()
{ {
if (!m_mem.isAttached()) {
return true;
}
bool out = false; bool out = false;
if (!m_ready) { if (!m_ready) {
m_mem.lock(); m_mem.lock();