@@ -415,25 +415,6 @@ public async Task InitAsync(PluginInitContext context)
415
415
// init score helper
416
416
ScoreHelper = new ScoreHelper ( ScoreInterval ) ;
417
417
418
- // init clipboard monitor
419
- if ( OperatingSystem . IsWindowsVersionAtLeast ( 10 , 0 , 10240 ) )
420
- {
421
- ClipboardMonitor = new ClipboardMonitorWin ( )
422
- {
423
- ObserveLastEntry = false ,
424
- ObservableFormats = ObservableDataFormats
425
- } ;
426
- }
427
- else
428
- {
429
- ClipboardMonitor = new ClipboardMonitorW ( )
430
- {
431
- ObserveLastEntry = false ,
432
- ObservableFormats = ObservableDataFormats
433
- } ;
434
- }
435
- ClipboardMonitor . SetContext ( context ) ;
436
-
437
418
// init windows clipboard helper
438
419
WindowsClipboardHelper = new ( ) ;
439
420
WindowsClipboardHelper . SetClipboardPlus ( this ) ;
@@ -450,9 +431,12 @@ public async Task InitAsync(PluginInitContext context)
450
431
Context . LogDebug ( ClassName , "Init database successfully" ) ;
451
432
452
433
// dispose clipboard monitor
453
- ClipboardMonitor . ClipboardChanged -= ClipboardMonitor_OnClipboardChanged ;
454
- ClipboardMonitor . Dispose ( ) ;
455
- ClipboardMonitor = null ;
434
+ if ( ClipboardMonitor != null )
435
+ {
436
+ ClipboardMonitor . ClipboardChanged -= ClipboardMonitor_OnClipboardChanged ;
437
+ ClipboardMonitor . Dispose ( ) ;
438
+ ClipboardMonitor = null ;
439
+ }
456
440
457
441
// init Windows clipboard helper & records from Windows clipboard history
458
442
EnableWindowsClipboardHelper ( true ) ;
@@ -470,6 +454,23 @@ public async Task InitAsync(PluginInitContext context)
470
454
Context . LogDebug ( ClassName , $ "Init { RecordsList . Count } records successfully") ;
471
455
472
456
// init & start clipboard monitor
457
+ if ( OperatingSystem . IsWindowsVersionAtLeast ( 10 , 0 , 10240 ) )
458
+ {
459
+ ClipboardMonitor = new ClipboardMonitorWin ( )
460
+ {
461
+ ObserveLastEntry = false ,
462
+ ObservableFormats = ObservableDataFormats
463
+ } ;
464
+ }
465
+ else
466
+ {
467
+ ClipboardMonitor = new ClipboardMonitorW ( )
468
+ {
469
+ ObserveLastEntry = false ,
470
+ ObservableFormats = ObservableDataFormats
471
+ } ;
472
+ }
473
+ ClipboardMonitor . SetContext ( context ) ;
473
474
ClipboardMonitor . ClipboardChanged += ClipboardMonitor_OnClipboardChanged ;
474
475
ClipboardMonitor . StartMonitoring ( ) ;
475
476
if ( ClipboardMonitor . GetType ( ) == typeof ( ClipboardMonitorWin ) )
0 commit comments