Skip to content

Commit 23f6047

Browse files
authored
Merge pull request #111 from rdumusc/master
DesktopStreamer: bugfix; always stop streaming when the stream window is closed
2 parents 0368ca1 + ffc885e commit 23f6047

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

apps/DesktopStreamer/Stream.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@ class Stream::Impl
7474

7575
bool processEvents( const bool interact )
7676
{
77-
while( _stream.isRegisteredForEvents() && _stream.hasEvent( ))
77+
while( _stream.hasEvent( ))
7878
{
79-
deflect::Event event = _stream.getEvent();
79+
const deflect::Event event = _stream.getEvent();
8080

8181
if( event.type == deflect::Event::EVT_CLOSE )
8282
return false;
8383

84-
if( !interact )
84+
if( !_stream.isRegisteredForEvents() || !interact )
8585
continue;
8686

8787
switch( event.type )

doc/Changelog.md

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ Changelog {#Changelog}
55

66
### 0.11.0 (git master)
77

8+
* [111](https://github.com/BlueBrain/Deflect/pull/111):
9+
DesktopStreamer: bugfix; stop streaming when the server closes the stream
10+
and the "remote control" option was not enabled.
811
* [110](https://github.com/BlueBrain/Deflect/pull/110):
912
DesktopStreamer: Support for streaming multiple windows on OSX disabled by
1013
default, can be enabled with cmake -DDESKTOPSTREAMER_ENABLE_MULTIWINDOW=ON.

0 commit comments

Comments
 (0)