From a221bc77b116fd7726b00d15c752aff09d7859c6 Mon Sep 17 00:00:00 2001
From: CRIMX <straybugs@gmail.com>
Date: Sun, 6 May 2018 14:43:48 +0800
Subject: [PATCH] fix(helpers): get initial config

---
 src/_helpers/config-manager.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/_helpers/config-manager.ts b/src/_helpers/config-manager.ts
index 5637cd416..999c975e5 100644
--- a/src/_helpers/config-manager.ts
+++ b/src/_helpers/config-manager.ts
@@ -1,7 +1,7 @@
 import { AppConfig, appConfigFactory } from '@/app-config'
 import { storage, StorageListenerCb, StorageUpdate } from './browser-api'
 import { map, filter } from 'rxjs/operators'
-import { Observable } from 'rxjs'
+import { Observable, from, concat } from 'rxjs'
 
 export type AppConfigChanged = {
   config: {
@@ -32,9 +32,12 @@ export function addAppConfigListener (cb: StorageListenerCb): void {
  * Get AppConfig and create a stream listening config changing
  */
 export function createAppConfigStream (): Observable<AppConfig> {
-  return storage.createStream<AppConfig>('config').pipe(
-    filter((config): config is StorageUpdate<AppConfig> => Boolean(config.newValue)),
-    map(config => config.newValue),
+  return concat(
+    from(getAppConfig()),
+    storage.createStream<AppConfig>('config').pipe(
+      filter((config): config is StorageUpdate<AppConfig> => Boolean(config.newValue)),
+      map(config => config.newValue),
+    ),
   )
 }