Migrate to parking_lot
This commit is contained in:
1 parent
bf805b79e5
commit
66f8a83dec
13 files changed
+85
-73
No files matched your search
+5
-4
@@ -30,7 +30,8 @@ use iced::keyboard::Event;
|
||||
use iced::{Element, Task};
|
||||
use reqwest::Error;
|
||||
use rusqlite::Connection;
|
||||
use std::sync::{Arc, Mutex};
|
||||
use std::sync::Arc;
|
||||
use parking_lot::Mutex;
|
||||
use std::time::Instant;
|
||||
|
||||
impl Default for ScreenState {
|
||||
@@ -97,7 +98,7 @@ impl ScreenState {
|
||||
let reading_additional_task = Task::perform(Self::load_additional_data(), |data| data);
|
||||
|
||||
let final_task;
|
||||
let state_guard = state.app_state.lock().unwrap();
|
||||
let state_guard = state.app_state.lock();
|
||||
if state_guard.sync_data.auto_web_fetch {
|
||||
let key = state_guard.sync_data.key.clone().unwrap();
|
||||
final_task = Task::batch([
|
||||
@@ -169,13 +170,13 @@ impl ScreenState {
|
||||
}
|
||||
|
||||
if let DataLoaded(data) = message {
|
||||
self.app_state.lock().unwrap().activity = data;
|
||||
self.app_state.lock().activity = data;
|
||||
return Task::none();
|
||||
}
|
||||
|
||||
if let UpdateData = message {
|
||||
println!("Loading data");
|
||||
let mut state = self.app_state.lock().unwrap();
|
||||
let mut state = self.app_state.lock();
|
||||
if cfg!(windows) {
|
||||
state.connection = Connection::open_in_memory().unwrap();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user