diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2021-07-14 17:16:14 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2021-07-15 09:08:06 +0100 |
| commit | 823c30b39b1e2dc8db5203bea78599d6257ff72d (patch) | |
| tree | a9c5320669afc7adbca196d22f36604b5150e233 /kit | |
| parent | log: don't try to get the channel of a non-existing logger (diff) | |
| download | online-823c30b39b1e2dc8db5203bea78599d6257ff72d.tar.gz online-823c30b39b1e2dc8db5203bea78599d6257ff72d.zip | |
Ensure that we get the file-name right before sending the save result.
We cannot rely on wsd being slower than the kit. The rename
has to happen before wsd / DocumentBroker gets to trying to access
the filename. fixes #2874.
Change-Id: Ie1e67cd059fb6a663048967c47759238c067172d
Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'kit')
| -rw-r--r-- | kit/ChildSession.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp index 22609e2e36..cf35aca688 100644 --- a/kit/ChildSession.cpp +++ b/kit/ChildSession.cpp @@ -2733,8 +2733,6 @@ void ChildSession::loKitCallback(const int type, const std::string& payload) break; case LOK_CALLBACK_UNO_COMMAND_RESULT: { - sendTextFrame("unocommandresult: " + payload); - Parser parser; Poco::Dynamic::Var var = parser.parse(payload); Object::Ptr object = var.extract<Object::Ptr>(); @@ -2779,6 +2777,8 @@ void ChildSession::loKitCallback(const int type, const std::string& payload) } #endif } + + sendTextFrame("unocommandresult: " + payload); } break; case LOK_CALLBACK_ERROR: |