Skip to content

Commit ed024ec

Browse files
committed
Merge pull request #152 from dgets/restore-sys-properties-work
Restore sys properties work (not done, just other errata cleaned up)
2 parents 9c44f09 + a353e64 commit ed024ec

1 file changed

Lines changed: 19 additions & 19 deletions

File tree

ddoc2.js

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -481,12 +481,6 @@ docIface = {
481481
roomData.fileIO.roomRecFilename + "\n"); //why no workee? 8o|
482482
}
483483

484-
/*for each(var area in msg_area.grp_list[topebaseno].code) {
485-
roomSettings[area] = roomData.fileIO.snagRoomInfoBlob(
486-
"/sbbs/data/user/docrooms",
487-
//roomData.fileIO.roomRecFilename,
488-
area);
489-
}*/
490484
try {
491485
roomData.fileIO.snagRoomInfoBlob();
492486
} catch (e) {
@@ -507,7 +501,7 @@ docIface = {
507501
}
508502

509503
//save user setting defaults
510-
docIface.util.preUserSettings = user.settings;
504+
this.preUserSettings = user.settings;
511505
this.turnOffSynchronetDefaults();
512506
if (userSettings.confined) {
513507
bbs.log_str(user.alias + " is entering dDOC shell and " +
@@ -529,9 +523,15 @@ docIface = {
529523
user.settings |= USER_PAUSE;
530524

531525
//save bbs defaults
532-
docIface.util.preSubBoard = bbs.cursub;
533-
docIface.util.preMsgGroup = bbs.curgrp;
534-
docIface.util.preFileDir = bbs.curdir;
526+
if (userSettings.debug.misc) {
527+
console.putmsg(yellow + "Saving settings for later restoration:\n" +
528+
"preSubBoard (user.cursub):\t" + green + user.cursub + yellow +
529+
"\npreMsgGroup (user.curgrp):\t" + green + user.curgrp + yellow +
530+
"\npreFileDir (user.curdir):\t" + green + user.curdir + "\n");
531+
}
532+
this.preSubBoard = user.cursub;
533+
this.preMsgGroup = user.curgrp;
534+
this.preFileDir = user.curdir;
535535

536536
//snag user zapped rooms list
537537
try {
@@ -582,19 +582,19 @@ docIface = {
582582
bbs.log_key("L");
583583

584584
if (userSettings.debug.flow_control) {
585-
console.putmsg(red + "\nRestoring bbs.* properties:\n" +
586-
" bbs.cursub: " + docIface.util.preSubBoard + "\n" +
587-
" bbs.curgrp: " + docIface.util.preMsgGroup + "\n" +
588-
" bbs.curdir: " + docIface.util.preFileDir + "\n");
585+
console.putmsg(red + "\nRestoring user.* properties:\n" +
586+
" user.cursub: " + this.preSubBoard + "\n" +
587+
" user.curgrp: " + this.preMsgGroup + "\n" +
588+
" user.curdir: " + this.preFileDir + "\n");
589589
console.putmsg(red + "\nRestoring user.settings . . .\n");
590590
}
591591

592592
//restore initial settings prior to exit
593-
bbs.cursub = docIface.util.preSubBoard;
594-
user.cursub = bbs.cursub_code;
595-
bbs.curgrp = docIface.util.preMsgGroup;
596-
bbs.curdir = docIface.util.preFileDir;
597-
user.settings = docIface.util.preUserSettings;
593+
user.cursub = this.preSubBoard;
594+
//user.cursub = bbs.cursub_code;
595+
user.curgrp = this.preMsgGroup;
596+
user.curdir = this.preFileDir;
597+
user.settings = this.preUserSettings;
598598

599599
//disable H exemption in case they go back to usual shell so that
600600
//we can handle events, etc

0 commit comments

Comments
 (0)