--- np2/win9x/toolwin.cpp	2003/11/04 15:44:59	1.13
+++ np2/win9x/toolwin.cpp	2003/11/11 14:50:52	1.15
@@ -180,17 +180,12 @@ static void calctextsize(char *path, int
 	file_cutname(path);
 	file_cutseparator(path);
 	file_cutname(path);
+	file_cutseparator(path);
 	l = strlen(path);
-	if (l > 1) {
-		l -= 1;
-		if (milstr_kanji2nd(p, l - 1)) {
-			l--;
-		}
-	}
-	else {
-		l = 0;
+	work[0] = '\0';
+	if (l) {
+		milstr_ncpy(work, str_browse, sizeof(work));
 	}
-	milstr_ncpy(work, str_browse, sizeof(work));
 	milstr_ncat(work, p + l, sizeof(work));
 	GetTextExtentPoint32(hdc, work, strlen(work), &tail);
 	pos = 0;
@@ -618,6 +613,7 @@ const char		*p;
 	sysmng_update(SYS_UPDATEOSCFG);
 
 	wlex = np2_winlocexallwin(hWndMain);
+	winlocex_setholdwnd(wlex, hWnd);
 	toolwindestroy();
 	hbmp = skinload(np2tool.skin);
 	if (hbmp == NULL) {
@@ -862,6 +858,7 @@ static LRESULT CALLBACK twproc(HWND hWnd
 		case WM_LBUTTONDBLCLK:
 			np2tool.type ^= 1;
 			wlex = np2_winlocexallwin(hWndMain);
+			winlocex_setholdwnd(wlex, hWnd);
 			np2class_windowtype(hWnd, (np2tool.type & 1) << 1);
 			winlocex_move(wlex);
 			winlocex_destroy(wlex);