Skip to content

Commit a52bd1f

Browse files
committed
fixes
1 parent 585ac38 commit a52bd1f

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

src/config/console_handler.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
use crate::hide_console_window;
22

33
impl super::config_app::Config {
4-
pub fn hide_console_window(hide: bool) {
4+
pub unsafe fn hide_console_window(hide: bool) {
5+
use winapi::um::winuser::GetShellWindow;
56
use winapi::um::wincon::GetConsoleWindow;
67
use winapi::um::winuser::{ShowWindow, SW_HIDE, SW_SHOWNORMAL};
8+
let mut window = GetConsoleWindow();
9+
if window.is_null() { window = GetShellWindow(); }
710

8-
let window = unsafe { GetConsoleWindow() };
9-
if !window.is_null() {
10-
unsafe {
11-
ShowWindow(window, if hide { SW_HIDE } else { SW_SHOWNORMAL });
12-
}
11+
if window.is_null() {
12+
ShowWindow(window, if hide { SW_HIDE } else { SW_SHOWNORMAL });
1313
}
1414
}
1515

src/lib.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
21
pub mod config;
32
pub mod kb_output;
43

54
use clipboard::ClipboardContext;
65
use clipboard::ClipboardProvider;
76
use std::collections::HashMap;
87
use std::thread::sleep;
9-
108
use crate::config::config_app::{Config, KeysHandlers};
119
use crate::kb_output::keyboard_output::KbOutput;
1210
use winput::message_loop;
@@ -17,14 +15,12 @@ pub fn run() -> Result<(), &'static str> {
1715
let clipbd_context: ClipboardContext =
1816
ClipboardProvider::new().expect("Clipboard Context create fail!");
1917
let mut cfg = Config::new(KeysHandlers::KEY, KeysHandlers::SPECIAL_KEY);
20-
2118
cfg.setting_config()?;
22-
2319
main_loop(&mut cfg, clipbd_context)
2420
}
2521

2622
pub fn hide_console_window(hide: bool) {
27-
Config::hide_console_window(hide);
23+
unsafe { Config::hide_console_window(hide); }
2824
}
2925

3026
fn main_loop(cfg: &mut Config, mut clipbd_context: ClipboardContext) -> Result<(), &'static str> {

0 commit comments

Comments
 (0)