From ecb4f82dd73b7cebefc878f5a2582e964f781c7c Mon Sep 17 00:00:00 2001 From: Felipe Cecagno Date: Mon, 26 Jan 2015 13:25:09 -0200 Subject: [PATCH] fixed the issue of not opening the correct number of additional notes when requested --- .../bigbluebutton/core/apps/sharednotes/SharedNotesApp.scala | 2 +- .../org/bigbluebutton/modules/layout/managers/LayoutManager.as | 2 +- .../modules/sharednotes/services/MessageReceiver.as | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/sharednotes/SharedNotesApp.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/sharednotes/SharedNotesApp.scala index fe4d4728d4..85d5810116 100644 --- a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/sharednotes/SharedNotesApp.scala +++ b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/sharednotes/SharedNotesApp.scala @@ -69,7 +69,7 @@ trait SharedNotesApp { def handleRequestAdditionalNotesSetRequest(msg: RequestAdditionalNotesSetRequest) { notes.synchronized { - var num = msg.additionalNotesSetSize - notes.size + var num = msg.additionalNotesSetSize - notes.size + 1 for (i <- 1 to num) { createAdditionalNotesNonSync(msg.requesterID) } diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as b/bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as index e5cb41f43f..96f5da2b41 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as @@ -244,6 +244,7 @@ package org.bigbluebutton.modules.layout.managers if (layout != null) { layout.applyToCanvas(_canvas); dispatchSwitchedLayoutEvent(layout.name); + UserManager.getInstance().getConference().numAdditionalSharedNotes = layout.numAdditionalSharedNotes; } updateCurrentLayout(layout); @@ -262,7 +263,6 @@ package org.bigbluebutton.modules.layout.managers public function applyRemoteLayout(e:LayoutFromRemoteEvent):void { var layout:LayoutDefinition = e.layout; - UserManager.getInstance().getConference().numAdditionalSharedNotes = layout.numAdditionalSharedNotes; applyLayout(layout); } diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/services/MessageReceiver.as b/bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/services/MessageReceiver.as index ac5291eab4..421a474c3a 100644 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/services/MessageReceiver.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/services/MessageReceiver.as @@ -82,7 +82,7 @@ package org.bigbluebutton.modules.sharednotes.services } private function handleCreateAdditionalNotesCommand(message:Object):void { - trace(LOG + "Handling private chat message [" + message + "]"); + trace(LOG + "Handling create additional notes message [" + message + "]"); var e:SharedNotesEvent = new SharedNotesEvent(SharedNotesEvent.CREATE_ADDITIONAL_NOTES_REPLY_EVENT); e.payload.notesId = message.noteID;