clean bg mask code, fix hariai bug

pms2bemani/pms2bemani/pms2bemani.py

@@ -800,7 +800,7 @@ if __name__ == "__main__":
 
     output_path = os.path.join(args.output, args.name)
 
-    mask = args.metadata_mask + 256 if args.bg != None else args.metadata_mask
+    mask = args.metadata_mask
     charts_xml = []
 
     # Generate list of keysounds based on input charts
@@ -912,6 +912,7 @@ if __name__ == "__main__":
     if args.bg:
         # Create background folder
         tex_files['bg_diff_ifs'] = create_bg(output_path, args.musicid, args.bg)
+        mask |= 0x00000100  # Required for songs that shows a background
 
     if args.metadata_hariai_is_jacket:
         mask |= 0x00000020  # The alternate hariai image (set by using 0x800000) is a song jacket instead of a character portrait

pms2bemani/pms2bemani/pms2bemaniGUI.py

@@ -562,12 +562,12 @@ class Application(tkinter.Frame):
             self.tag_image_hariai = tkinter.Label(parent,image=banner)
             self.tag_image_hariai.image = banner
             self.tag_image_hariai.grid(column=4, row=5,sticky="W",pady = 2,rowspan=13,columnspan=3)
+            self.hariai_in_game.set(False)
          else:
             tkinter.messagebox.showerror(title="Error", message=self.tr["Image error"])
             return 0
          widget.delete(0,"end")
          widget.insert(0,filename)
-         self.hariai_in_game.set(False)