File tree Expand file tree Collapse file tree 2 files changed +4
-3
lines changed Expand file tree Collapse file tree 2 files changed +4
-3
lines changed Original file line number Diff line number Diff line change @@ -11,6 +11,7 @@ Unreleased` header.
11
11
12
12
# Unreleased
13
13
14
+ - On X11, fix ` NotSupported ` error not propagated when creating event loop.
14
15
- On Wayland, fix resize not issued when scale changes
15
16
- On X11 and Wayland, fix arrow up on keypad reported as ` ArrowLeft ` .
16
17
Original file line number Diff line number Diff line change @@ -784,7 +784,7 @@ impl<T: 'static> EventLoop<T> {
784
784
#[ cfg( wayland_platform) ]
785
785
Backend :: Wayland => EventLoop :: new_wayland_any_thread ( ) . map_err ( Into :: into) ,
786
786
#[ cfg( x11_platform) ]
787
- Backend :: X => Ok ( EventLoop :: new_x11_any_thread ( ) . unwrap ( ) ) ,
787
+ Backend :: X => EventLoop :: new_x11_any_thread ( ) . map_err ( Into :: into ) ,
788
788
}
789
789
}
790
790
@@ -794,10 +794,10 @@ impl<T: 'static> EventLoop<T> {
794
794
}
795
795
796
796
#[ cfg( x11_platform) ]
797
- fn new_x11_any_thread ( ) -> Result < EventLoop < T > , XNotSupported > {
797
+ fn new_x11_any_thread ( ) -> Result < EventLoop < T > , EventLoopError > {
798
798
let xconn = match X11_BACKEND . lock ( ) . unwrap ( ) . as_ref ( ) {
799
799
Ok ( xconn) => xconn. clone ( ) ,
800
- Err ( err ) => return Err ( err . clone ( ) ) ,
800
+ Err ( _ ) => return Err ( EventLoopError :: NotSupported ( NotSupportedError :: new ( ) ) ) ,
801
801
} ;
802
802
803
803
Ok ( EventLoop :: X ( x11:: EventLoop :: new ( xconn) ) )
You can’t perform that action at this time.
0 commit comments