File tree Expand file tree Collapse file tree 1 file changed +10
-9
lines changed Expand file tree Collapse file tree 1 file changed +10
-9
lines changed Original file line number Diff line number Diff line change @@ -115,7 +115,7 @@ impl AppContext {
115
115
}
116
116
117
117
pub ( crate ) struct ActivationContext {
118
- _task : Task < ( ) > ,
118
+ _task : Option < Task < ( ) > > ,
119
119
adapters : Vec < ( usize , LazyAdapter ) > ,
120
120
}
121
121
@@ -125,14 +125,15 @@ impl ActivationContext {
125
125
async fn get_or_init < ' a > ( ) -> AsyncMutexGuard < ' a , ActivationContext > {
126
126
ACTIVATION_CONTEXT
127
127
. get_or_init ( async {
128
- let session_bus = Connection :: session ( ) . await . unwrap ( ) ;
129
- let session_bus_copy = session_bus. clone ( ) ;
130
- let task = session_bus. executor ( ) . spawn (
131
- async move {
132
- listen ( session_bus_copy) . await . unwrap ( ) ;
133
- } ,
134
- "accesskit_task" ,
135
- ) ;
128
+ let task = Connection :: session ( ) . await . ok ( ) . map ( |session_bus| {
129
+ let session_bus_copy = session_bus. clone ( ) ;
130
+ session_bus. executor ( ) . spawn (
131
+ async move {
132
+ listen ( session_bus_copy) . await . unwrap ( ) ;
133
+ } ,
134
+ "accesskit_task" ,
135
+ )
136
+ } ) ;
136
137
Arc :: new ( AsyncMutex :: new ( ActivationContext {
137
138
_task : task,
138
139
adapters : Vec :: new ( ) ,
You can’t perform that action at this time.
0 commit comments