diff --git a/app/src/main/java/com/gh/common/constant/Config.java b/app/src/main/java/com/gh/common/constant/Config.java
index 3b27711e5e..6dee0f56eb 100644
--- a/app/src/main/java/com/gh/common/constant/Config.java
+++ b/app/src/main/java/com/gh/common/constant/Config.java
@@ -235,7 +235,7 @@ public class Config {
     }
 
     public static boolean isGameDomeSwitchOpen() {
-        return getSettings().getGameDomeSwitch().equals("on");
+        return getSettings().getGameDomeSwitch() != null && getSettings().getGameDomeSwitch().equals("on");
     }
 
     public static void fixHideFunction() {
diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameTagsDialog.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameTagsDialog.kt
index eab5c90556..090aa90d04 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameTagsDialog.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameTagsDialog.kt
@@ -1,13 +1,15 @@
 package com.gh.gamecenter.gamedetail.dialog
 
 import android.app.Dialog
-import android.content.DialogInterface
 import android.os.Bundle
-import android.view.*
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import androidx.core.content.ContextCompat
+import androidx.core.os.bundleOf
 import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.gh.base.fragment.BaseDialogFragment
 import com.gh.common.dialog.BaseTrackableDialogFragment
 import com.gh.common.util.DisplayUtils
 import com.gh.common.util.MtaHelper
@@ -18,7 +20,6 @@ import com.gh.gamecenter.entity.TagStyleEntity
 import com.gh.gamecenter.tag.TagsActivity
 import com.halo.assistant.HaloApp
 import kotlinx.android.synthetic.main.dialog_game_tags.view.*
-import java.util.concurrent.atomic.AtomicBoolean
 
 class GameTagsDialog : BaseTrackableDialogFragment() {
 
@@ -26,6 +27,12 @@ class GameTagsDialog : BaseTrackableDialogFragment() {
     lateinit var mTagStyles: ArrayList<TagStyleEntity>
     lateinit var mGameName: String
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        mGameName = requireArguments().getString("gameName") ?: ""
+        mTagStyles = requireArguments().getParcelableArrayList("tagStyles") ?: ArrayList()
+    }
+
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val createDialog = super.onCreateDialog(savedInstanceState)
         createDialog.setCanceledOnTouchOutside(true)
@@ -76,8 +83,7 @@ class GameTagsDialog : BaseTrackableDialogFragment() {
     companion object {
         fun showGameTagsDialog(context: FragmentActivity, tagStyles: ArrayList<TagStyleEntity>, gameName: String) {
             val dialog = GameTagsDialog().apply {
-                mTagStyles = tagStyles
-                mGameName = gameName
+                arguments = bundleOf("gameName" to gameName, "tagStyles" to tagStyles)
             }
             dialog.show(context.supportFragmentManager, DownloadDialog::class.java.name)
         }