Browse Source

Fix wrong channel texting after channel join.

Michał Słomkowski 8 years ago
parent
commit
7a45a4c40d
3 changed files with 5 additions and 4 deletions
  1. 1 1
      include/mumlib.hpp
  2. 1 1
      include/mumlib/Callback.hpp
  3. 3 2
      src/mumlib.cpp

+ 1 - 1
include/mumlib.hpp

@@ -41,7 +41,7 @@ namespace mumlib {
 
         void sendTextMessage(std::string message);
 
-        void joinChannel(int channel_id);
+        void joinChannel(int channelId);
 
     private:
         _Mumlib_Private *impl;

+ 1 - 1
include/mumlib/Callback.hpp

@@ -179,7 +179,7 @@ namespace mumlib {
                 string welcome_text,
                 int32_t session,
                 int32_t max_bandwidth,
-                int64_t permissions);
+                int64_t permissions) override;
 
         virtual void channelRemove(uint32_t channel_id) override;
 

+ 3 - 2
src/mumlib.cpp

@@ -379,9 +379,10 @@ namespace mumlib {
         impl->transport.sendControlMessage(MessageType::TEXTMESSAGE, textMessage);
     }
 
-    void Mumlib::joinChannel(int channel_id) {
+    void Mumlib::joinChannel(int channelId) {
         MumbleProto::UserState userState;
-        userState.set_channel_id(channel_id);
+        userState.set_channel_id(channelId);
         impl->transport.sendControlMessage(MessageType::USERSTATE, userState);
+        impl->channelId = channelId;
     }
 }