aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authordec05eba <dec05eba@protonmail.com>2018-11-04 03:44:11 +0100
committerdec05eba <dec05eba@protonmail.com>2018-11-04 03:44:14 +0100
commit905a9b962b1464cf2f293b21634d4aa665c009ab (patch)
treeb543552b95aa98e643edbd1171a3ee05e5ea7a08 /include
parentc7138bca7ea7d007198c544b2d8bc27ae414d2e2 (diff)
Fix crash when creating room when user is not a member of any other room
Diffstat (limited to 'include')
-rw-r--r--include/ChatWindow.hpp4
-rw-r--r--include/Window.hpp5
2 files changed, 7 insertions, 2 deletions
diff --git a/include/ChatWindow.hpp b/include/ChatWindow.hpp
index 7a61d91..d457b7d 100644
--- a/include/ChatWindow.hpp
+++ b/include/ChatWindow.hpp
@@ -16,11 +16,12 @@
namespace dchat
{
class ChatMessage;
+ class Window;
class ChatWindow : public Gtk::Grid
{
public:
- ChatWindow();
+ ChatWindow(Window *window);
~ChatWindow();
void addRoom(std::shared_ptr<Room> room);
void addMessage(const RoomAddMessageRequest &request);
@@ -59,5 +60,6 @@ namespace dchat
int roomCount;
RoomData *currentRoomData;
std::shared_ptr<Room> currentRoom;
+ Window *window;
};
} \ No newline at end of file
diff --git a/include/Window.hpp b/include/Window.hpp
index a29ec62..4355fb8 100644
--- a/include/Window.hpp
+++ b/include/Window.hpp
@@ -2,6 +2,7 @@
#include "ChatWindow.hpp"
#include "LoginWindow.hpp"
+#include "WindowNotification.hpp"
#include <gtkmm/window.h>
#include <gtkmm/stack.h>
#include <gtkmm/overlay.h>
@@ -17,6 +18,9 @@ namespace dchat
public:
Window();
virtual ~Window();
+
+ std::shared_ptr<Rooms> rooms;
+ WindowNotification *windowNotification;
private:
bool drawBackground(const Cairo::RefPtr<Cairo::Context> &cairo);
private:
@@ -26,7 +30,6 @@ namespace dchat
void draw(const Cairo::RefPtr<Cairo::Context> &cairo) { Gtk::Overlay::draw(cairo); }
};
- std::shared_ptr<Rooms> rooms;
std::mutex databaseCallbackMutex;
OverlayDrawable overlay;
Gtk::Stack stack;