Accept selected changes from PR #175

app/src/tray.rs

@@ -6,6 +6,12 @@ use tray_icon::{
     TrayIconBuilder, TrayIconEvent,
 };
 use winit::event_loop::{ControlFlow, EventLoopBuilder};
+<<<<<<< HEAD
+=======
+use image;
+
+#[cfg(target_os="windows")]
+>>>>>>> sawixy/master
 use winit::platform::windows::EventLoopBuilderExtWindows;
 
 use crate::config;
@@ -42,8 +48,9 @@ pub fn init() {
         #[cfg(target_os = "linux")]
         {
             use tray_icon::menu::Menu;
-
+            
             gtk::init().unwrap();
+
             let _tray_icon = TrayIconBuilder::new()
                 .with_menu(Box::new(tray_menu))
                 .with_tooltip(config::TRAY_TOOLTIP)
@@ -56,7 +63,7 @@ pub fn init() {
 
         // run the event loop
         let event_loop = EventLoopBuilder::new()
-            .with_any_thread(true)
+            // .with_any_thread(true)
             .build()
             .unwrap();