Update of /cvsroot/radmind/radmind-assistant/rsm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15895
Modified Files:
RSMLoadsetManager.m
Log Message:
Fix: Server Manager 0.9.5 edits wrong transcript (bug #1460103)
Index: RSMLoadsetManager.m
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/rsm/RSMLoadsetManager.m,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** RSMLoadsetManager.m 20 Mar 2006 18:58:51 -0000 1.43
--- RSMLoadsetManager.m 9 Apr 2006 20:00:28 -0000 1.44
***************
*** 195,198 ****
--- 195,199 ----
NSArray *items = nil;
BOOL validate = YES;
+ id transcriptView = nil;
int row = 0;
***************
*** 220,229 ****
row = [ transcriptTable selectedRow ];
items = _checkedInTranscripts;
} else if ( [[ transcriptWindow firstResponder ] isEqual: tmpTranscriptTable ] ) {
row = [ tmpTranscriptTable selectedRow ];
items = _tmpTranscripts;
}
! if ( row < 0 || ( [[[ items objectAtIndex: row ]
objectForKey: @"RadmindServerItemType" ] isEqualToString: @"directory" ]
&& [[ tItem itemIdentifier ] isEqualToString: RSMLMToolbarEditIdentifier ] )) {
--- 221,232 ----
row = [ transcriptTable selectedRow ];
items = _checkedInTranscripts;
+ transcriptView = [ transcriptWindow firstResponder ];
} else if ( [[ transcriptWindow firstResponder ] isEqual: tmpTranscriptTable ] ) {
row = [ tmpTranscriptTable selectedRow ];
items = _tmpTranscripts;
+ transcriptView = [ transcriptWindow firstResponder ];
}
! if ( row < 0 || ( transcriptView != nil && [[[ transcriptView itemAtRow: row ]
objectForKey: @"RadmindServerItemType" ] isEqualToString: @"directory" ]
&& [[ tItem itemIdentifier ] isEqualToString: RSMLMToolbarEditIdentifier ] )) {
***************
*** 1527,1530 ****
--- 1530,1535 ----
RAEditorLauncher *re = [[ RAEditorLauncher alloc ] init ];
NSMutableArray *t = nil;
+ id transcriptView;
+ int row = -1;
if ( [[ transcriptWindow firstResponder ] isEqual: transcriptTable ] ) {
***************
*** 1542,1549 ****
editor = @"Radmind Transcript Editor";
}
!
! tpath = [[ t objectAtIndex: [ transcriptTable selectedRow ]]
objectForKey: @"RadmindServerItemPath" ];
!
if ( ! [ re viewTrans: tpath withTextEditor: editor ] ) {
NSRunAlertPanel( @"Error launching editor.",
--- 1547,1556 ----
editor = @"Radmind Transcript Editor";
}
!
! transcriptView = [ transcriptWindow firstResponder ];
! row = [ transcriptView selectedRow ];
! tpath = [[ transcriptView itemAtRow: row ]
objectForKey: @"RadmindServerItemPath" ];
!
if ( ! [ re viewTrans: tpath withTextEditor: editor ] ) {
NSRunAlertPanel( @"Error launching editor.",
|
