summaryrefslogtreecommitdiff
path: root/NxWidgets
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-11-16 16:49:21 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-11-16 16:49:21 +0000
commitdbda56e617cfde1910ecf6091a76038f44dff65d (patch)
tree2d8f43731bee5df1d21b090dfa3f4fec008cb16e /NxWidgets
parentc96506f914b598e59fce7cc9b3c394a5ebe8d23c (diff)
downloadpx4-nuttx-dbda56e617cfde1910ecf6091a76038f44dff65d.tar.gz
px4-nuttx-dbda56e617cfde1910ecf6091a76038f44dff65d.tar.bz2
px4-nuttx-dbda56e617cfde1910ecf6091a76038f44dff65d.zip
Patches 4-6 from Petteri Aimonen
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5364 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'NxWidgets')
-rw-r--r--NxWidgets/ChangeLog.txt9
-rw-r--r--NxWidgets/nxwm/src/cstartwindow.cxx7
2 files changed, 12 insertions, 4 deletions
diff --git a/NxWidgets/ChangeLog.txt b/NxWidgets/ChangeLog.txt
index dca1f856d..ece08e4fd 100644
--- a/NxWidgets/ChangeLog.txt
+++ b/NxWidgets/ChangeLog.txt
@@ -198,9 +198,12 @@
This commit adds a simple forward declaration to the relevant files, based on the
configured icon. If the icon does not exist, linker will give an error about it.
Contributed by Petteri Aimonen.
-* NxWidgets/nxwm/src/ctaskbar.cxx: Highlight the current window in the task bar.
+* NxWidgets::CTaskBar: Highlight the current window in the task bar.
Contributed by Petteri Aimonen.
* NxWidgets/libnxwidgets/src/glyph_cycle.cxx: Width of glyph_cycle was wrong;
- Desctructor needs to by public. From Petteri Aimonen.
-* CNumericEdit. This is basically a label with plus and minus buttons.
+ Destructor needs to by public. From Petteri Aimonen.
+* NxWidgets::CNumericEdit. This is basically a label with plus and minus buttons.
Contributed by Petteri, Aimonen.
+* NxWM::CStartWindow: Fix mq_receive error handling with signal is recieved.
+ From Petteri Aimonen.
+
diff --git a/NxWidgets/nxwm/src/cstartwindow.cxx b/NxWidgets/nxwm/src/cstartwindow.cxx
index a99e81d88..cc8802b7c 100644
--- a/NxWidgets/nxwm/src/cstartwindow.cxx
+++ b/NxWidgets/nxwm/src/cstartwindow.cxx
@@ -654,8 +654,13 @@ int CStartWindow::startWindow(int argc, char *argv[])
{
gdbg("ERROR: mq_receive failed: %d\n", errval);
}
+ else
+ {
+ gdbg("mq_receive interrupted by signal\n");
+ }
+
+ continue;
}
- while (nbytes < 0);
gvdbg("Received msgid=%d nbytes=%d\n", msg.msgId, nbytes);
DEBUGASSERT(nbytes = sizeof(struct SStartWindowMessage) && msg.instance);