Skip to content

Commit 9e2f500

Browse files
committed
singlenotemode crash when deleting note, fixed
1 parent b695bdf commit 9e2f500

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

doc/tomboy-ng.1

+5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ tomboy-ng \- manage a collection of notes using a simple markup
77
[\fB\-g\fR]
88
[\fB-\-gnome3\fR]
99
[\fB\-\-debug\-sync\fR]
10+
[\fB\-\-debug\-index\fR]
1011
[\fB\-\-config\-dir\fR=\fIPATH_to_DIR\fR]
1112
[\fB\-o\fR \fIPATH_to_NOTE\fR]
1213
[\fB\-\-open-note\fR=\fIPATH_to_NOTE\fR]
@@ -33,6 +34,10 @@ Run gnome3 mode, needed on Linux releases based on gnome3 3.28 or later but not
3334
.BR \-\-debug-sync
3435
Generate a lot of logging information on the console during a sync process. Intended for debugging.
3536

37+
.TP
38+
.BR \-\-debug-index
39+
Generate a lot of logging information on the console while indexing the notes repo. Intended for debugging.
40+
3641
.TP
3742
.BR \-c ", " \-\-config\-dir=\fIPATH_to_DIR\fR
3843
Create or use an alternative config. That config could, for example, specify an alterative location to store notes and sync against a different file sync repository.

package/package_debian.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ LAZ_DIR=/home/dbannon/lazarus/lazarus_1_8_4
3232
function BuildIt () {
3333
cd $SOURCE_DIR
3434
echo "Building x86_64 Linux"
35-
$LAZ_DIR/lazbuild $BUILDOPTS --cpu="x86_64" --build-mode=Release --os="linux" Tomboy_NG.lpi
35+
lazbuild $BUILDOPTS --cpu="x86_64" --build-mode=Release --os="linux" Tomboy_NG.lpi
3636
echo "Building i386 Linux"
37-
$LAZ_DIR/lazbuild $BUILDOPTS --cpu="i386" --build-mode=ReleaseLin32 --os="linux" Tomboy_NG.lpi
37+
lazbuild $BUILDOPTS --cpu="i386" --build-mode=ReleaseLin32 --os="linux" Tomboy_NG.lpi
3838
echo "Building x86_64 Windows"
39-
$LAZ_DIR/lazbuild $BUILDOPTS --cpu="x86_64" --build-mode=ReleaseWin64 --os="win64" Tomboy_NG.lpi
39+
lazbuild $BUILDOPTS --cpu="x86_64" --build-mode=ReleaseWin64 --os="win64" Tomboy_NG.lpi
4040
echo "Building i386 Windows"
41-
$LAZ_DIR/lazbuild $BUILDOPTS --cpu="i386" --build-mode=ReleaseWin32 --os="win32" Tomboy_NG.lpi
41+
lazbuild $BUILDOPTS --cpu="i386" --build-mode=ReleaseWin32 --os="win32" Tomboy_NG.lpi
4242
echo "Building x86_64 Linux"
4343
# Todo - should check we now have binaries with todays date.
4444
echo "------------- FINISHED BUILDING -----------------"

tomboy-ng/editbox.pas

+4-1
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@
151151
2018/07/20 Force copy on selection paste to always paste to left of a newline.
152152
2018/07/23 If a note has no title in content but does have one in xml, caption is
153153
left blank and that crashes things that look for * in first char. Fixed
154+
2018/07/23 Fixed a bug that crashed when deleting a note in SingleNoteMode.
154155
}
155156

156157

@@ -386,7 +387,9 @@ procedure TEditBoxForm.ButtDeleteClick(Sender: TObject);
386387
if IDYES = Application.MessageBox('Delete this Note', PChar(St),
387388
MB_ICONQUESTION + MB_YESNO) then begin
388389
TimerSave.Enabled := False;
389-
if NoteFileName <> '' then
390+
if SingleNoteMode then
391+
DeleteFileUTF8(NoteFileName)
392+
else if NoteFileName <> '' then
390393
SearchForm.DeleteNote(NoteFileName);
391394
Dirty := False;
392395
Close;

0 commit comments

Comments
 (0)