Adjusted Platform Structure
This commit is contained in:
@@ -28,8 +28,6 @@
|
||||
namespace fennec
|
||||
{
|
||||
|
||||
using namespace wayland;
|
||||
|
||||
linux_platform::linux_platform(user _type)
|
||||
: platform(_type)
|
||||
, _display_driver(display_none) {
|
||||
@@ -45,7 +43,10 @@ linux_platform::linux_platform(user _type)
|
||||
}
|
||||
|
||||
linux_platform::~linux_platform() {
|
||||
|
||||
if (_display) {
|
||||
delete _display;
|
||||
_display = nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
shared_object* linux_platform::load_object(const cstring& file) {
|
||||
@@ -77,10 +78,10 @@ display* linux_platform::get_display() {
|
||||
|
||||
void linux_platform::_runtime_client_checks() {
|
||||
#ifdef FENNEC_LIB_WAYLAND
|
||||
if (wayland::load_symbols(this)) {
|
||||
if (libwayland::load_symbols(this)) {
|
||||
_display_driver = display_wayland;
|
||||
_display = new wayland_display(this);
|
||||
wayland::unload_symbols(this); // Doesn't actually unload symbols, just resets ref counter to only consider
|
||||
libwayland::unload_symbols(this); // Doesn't actually unload symbols, just resets ref counter to only consider
|
||||
// the created display
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user