Commit: 58cdb99e1d36df4da1b24e6cc68692f4b8202d90 - dtxmania_mac (git)

Commit MetaInfo

• Revision: 58cdb99e1d36df4da1b24e6cc68692f4b8202d90 (tree)
• Zeit: 2020-01-07 01:29:01
• Autor: yyagi <yyagi.dtxmania@gmai...>
• Commiter: yyagi

Log Message

#39817 Fixed not to crash when entering Sort menu, after showing non-music-select-screen.

Ändern Zusammenfassung

• delete: "DTXMania/\343\202\263\343\203\274\343\203\211/\343\202\271\343\203\206\343\203\274\343\202\270/05.\351\201\270\346\233\262/CActSelectPopupMenu.cs"

Diff

--- "a/DTXMania/\343\202\263\343\203\274\343\203\211/\343\202\271\343\203\206\343\203\274\343\202\270/05.\351\201\270\346\233\262/CActSelectPopupMenu.cs"
+++ "b/DTXMania/\343\202\263\343\203\274\343\203\211/\343\202\271\343\203\206\343\203\274\343\202\270/05.\351\201\270\346\233\262/CActSelectPopupMenu.cs"
@@ -64,15 +64,16 @@ namespace DTXMania
 			stqMenuTitle = new stQuickMenuItem();
 			stqMenuTitle.cItem = new COptionString(title);
 			stqMenuTitle.cItem.label = title;
-			stqMenuTitle.txName = TextureFactory.tテクスチャの生成(prvFont.DrawPrivateFont(title, Color.White, Color.Black), false);
-			stqMenuTitle.rectName = prvFont.RectStrings;
+			//stqMenuTitle.txName = TextureFactory.tテクスチャの生成(prvFont.DrawPrivateFont(title, Color.White, Color.Black), false);
+			//stqMenuTitle.rectName = prvFont.RectStrings;
 			lciMenuItems = new stQuickMenuItem[menulist.Count];
 			for (int i = 0; i < menulist.Count; i++)
 			{
 				stQuickMenuItem stqm = new stQuickMenuItem();
 				stqm.cItem = menulist[i];
-				stqm.txName = TextureFactory.tテクスチャの生成(prvFont.DrawPrivateFont(menulist[i].label, Color.White, Color.Black), false);
-				stqm.rectName = prvFont.RectStrings;
+				stqm.label = menulist[i].label;
+				//stqm.txName = TextureFactory.tテクスチャの生成(prvFont.DrawPrivateFont(menulist[i].label, Color.White, Color.Black), false);
+				//stqm.rectName = prvFont.RectStrings;
 				lciMenuItems[i] = stqm;
 			}
 
@@ -205,6 +206,18 @@ namespace DTXMania
 				{
 					this.txPopupMenuBackground = TextureFactory.tテクスチャの生成(pathPopupMenuBackground, false);
 				}
+
+				if (stqMenuTitle.txName == null)
+				{
+					stqMenuTitle.txName = TextureFactory.tテクスチャの生成(prvFont.DrawPrivateFont(stqMenuTitle.cItem.label, Color.White, Color.Black), false);
+					stqMenuTitle.rectName = prvFont.RectStrings;
+				}
+				for (int i = 0; i < lciMenuItems.Length; i++)
+				{
+					lciMenuItems[i].txName = TextureFactory.tテクスチャの生成(prvFont.DrawPrivateFont(lciMenuItems[i].label, Color.White, Color.Black), false);
+					lciMenuItems[i].rectName= prvFont.RectStrings;
+				}
+
 				base.OnManagedリソースの作成();
 			}
 		}
@@ -325,7 +338,10 @@ namespace DTXMania
 				#endregion
 				#region [ タイトル描画 ]
 				int x = (int)(240 * Scale.X), y = (int)(16 * Scale.Y);
-				stqMenuTitle.txName.t2D描画(CDTXMania.Instance.Device, x, y);
+				if (stqMenuTitle.txName != null)
+				{
+					stqMenuTitle.txName.t2D描画(CDTXMania.Instance.Device, x, y);
+				}
 				#endregion
 				#region [ カーソル描画 ]
 				if (this.txCursor != null)
@@ -393,6 +409,7 @@ namespace DTXMania
 			internal COptionBase cItem;
 			internal CTexture txName;
 			internal Rectangle rectName;
+			internal string label;
 		}
 		private stQuickMenuItem[] lciMenuItems;
 		CPrivateFastFont prvFont;