mirror of
https://github.com/rad4day/Waybar.git
synced 2023-12-21 10:22:59 +01:00
a1cd0acac5
The segfaults were happening on GTK icon theme functions, which are called via the C++ interface functions such as Gtk::IconTheme::has_icon. There are multiple modules and threads using this functions on the default icon theme by calling Gtk::IconTheme::get_default(), which returns the same object for all callers, and was causing concurrent access to the same internal data structures on the GTK lib. Even a seemingly read-only function such as has_icon can cause writes due to the internal icon cache being updated. To avoid this issues, a program wide global mutex must be used to ensure a single thread is accessing the default icon theme instance. This commit implements wrappers for the existing IconTheme function calls, ensuring the global lock is held while calling the underling GTK functions.
13 lines
314 B
C++
13 lines
314 B
C++
#pragma once
|
|
#include <string>
|
|
#include <mutex>
|
|
#include <gtkmm/icontheme.h>
|
|
|
|
class DefaultGtkIconThemeWrapper {
|
|
private:
|
|
static std::mutex default_theme_mutex;
|
|
public:
|
|
static bool has_icon(const std::string&);
|
|
static Glib::RefPtr<Gdk::Pixbuf> load_icon(const char*, int, Gtk::IconLookupFlags);
|
|
};
|